From nobody Tue Jul 26 19:30:54 2022 X-Original-To: dev-commits-src-all@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 4Lsn7y3V8zz4WwFZ; Tue, 26 Jul 2022 19:30: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 4Lsn7y2P7cz42dS; Tue, 26 Jul 2022 19:30:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658863854; 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=KbYxuRbHhjmQCnHky/8CNDub5A9q3uePZPbF89cBLSc=; b=gict8H4WfGsIIWk9L/gkkSBbP+JTcRcFwMQKYMwHogbEuUVpGdMaF15d/n4EL4xONSgCXu cX/Xm/YgcIk/AgaVjSsJqL36lRU16rfGbs9h7+Pc7Vd4l9KeZcZKHyGxtLdb97/S3pfQzr +K5H1Bj/2GHnLNlHUMqNn7CLNMzJjOCS0yVetTRJKUIHMJMGbJQPZrLGQoYKKm4zva66KS d9k4thM5m1L4CZqnjwbbRmpmRBdRCap3r356ly9vBJ/aqmKBOC6dDNH/c1xiMcM8cJv81h l/im3n246AWGu449gcSF9ejr5boW5FwATYhqo1p6tc0g44iB8jOpEUoMCv+afA== 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 4Lsn7y1VSLzpMY; Tue, 26 Jul 2022 19:30:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26QJUsCR029662; Tue, 26 Jul 2022 19:30:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26QJUsLU029661; Tue, 26 Jul 2022 19:30:54 GMT (envelope-from git) Date: Tue, 26 Jul 2022 19:30:54 GMT Message-Id: <202207261930.26QJUsLU029661@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marcin Wojtas Subject: git: c5da1ee63d03 - stable/13 - ena: Use atomic_load/store functions for first_interrupt variable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mw X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c5da1ee63d039999324ffa6d447ad3a82e22fb37 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658863854; 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=KbYxuRbHhjmQCnHky/8CNDub5A9q3uePZPbF89cBLSc=; b=rBiWITiWtzMkNf4cWEOgBM1Hks5mqqqRjyHCWc0a3IjgGNMhjw7Dd6K2SJPJudmkD1c7DO kKDcNz1dhoB/prN88nYzLUzQevaRtlTf6bAq5zkazUfGV27OPB4GfHfuUkvy3niIwyeSOo y8a9Nzi6DWEKYlqJivk7bV0KxePu3nMRCB3i9UOhWrthKt7oE4OJe+zrsTB7OGJXJA95nf uonKqXK9DGKllJEAxs0/Q3fjyT8F0kRTaJPQCs3cjExY0QslLjPQNKHQuEtbVZFmqqibrp jonij5jpwmzyYFtauaNktiKD8ZhRL24nwYRWfom2BGIpicc4LlTUuVUenIuCZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658863854; a=rsa-sha256; cv=none; b=IFeMfnC2ksDcrcAieU1qQS8k/bOavp9Sc36Yxa2eM1HAaNo5qso/F2DXxCTY+Adew+ElPF C88BY+QxHjN1YXV4XCTg25BTGe0eRXBaLpzTBfvIjIjYg+NCyuGe4zxlZdKTHzVUZYM+nM vs0VM41wEpdyihiVgmmV/sAmUkttqed48BtRZT0jEJmV5l9p0vuanFrGnnHDCkyW8/SpnC Kb8gbFLjcyjg9EYLAwTpRV8K+HC212iFX9wendjWHpwxOueYNY+8WuIc7YPoYf5UM8TKaM sYtAxtvW/Ezf2sbKWEGYKuD7AkbvzzRyuveJ5JR4KV6Dv4/xV8/Y4DQGzXzu6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mw: URL: https://cgit.FreeBSD.org/src/commit/?id=c5da1ee63d039999324ffa6d447ad3a82e22fb37 commit c5da1ee63d039999324ffa6d447ad3a82e22fb37 Author: Dawid Gorecki AuthorDate: 2022-06-10 09:18:09 +0000 Commit: Marcin Wojtas CommitDate: 2022-07-26 19:30:15 +0000 ena: Use atomic_load/store functions for first_interrupt variable Surround cases of possible simultaneous access to the first_interrupt variable with atomic_load/store functions. Obtained from: Semihalf MFC after: 2 weeks Sponsored by: Amazon, Inc. (cherry picked from commit 0ac122c388d9a5e189e60378f1950b82a22bbdd1) --- sys/dev/ena/ena.c | 7 ++++--- sys/dev/ena/ena_datapath.c | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/sys/dev/ena/ena.c b/sys/dev/ena/ena.c index 044a8327972e..343f2f9626cd 100644 --- a/sys/dev/ena/ena.c +++ b/sys/dev/ena/ena.c @@ -50,6 +50,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include #include @@ -381,7 +382,7 @@ ena_init_io_rings_common(struct ena_adapter *adapter, struct ena_ring *ring, ring->qid = qid; ring->adapter = adapter; ring->ena_dev = adapter->ena_dev; - ring->first_interrupt = false; + atomic_store_8(&ring->first_interrupt, false); ring->no_interrupt_event_cnt = 0; } @@ -2983,7 +2984,7 @@ static int check_for_rx_interrupt_queue(struct ena_adapter *adapter, struct ena_ring *rx_ring) { - if (likely(rx_ring->first_interrupt)) + if (likely(atomic_load_8(&rx_ring->first_interrupt))) return (0); if (ena_com_cq_empty(rx_ring->ena_com_io_cq)) @@ -3026,7 +3027,7 @@ check_missing_comp_in_tx_queue(struct ena_adapter *adapter, bintime_sub(&time, &tx_buf->timestamp); time_offset = bttosbt(time); - if (unlikely(!tx_ring->first_interrupt && + if (unlikely(!atomic_load_8(&tx_ring->first_interrupt) && time_offset > 2 * adapter->missing_tx_timeout)) { /* * If after graceful period interrupt is still not diff --git a/sys/dev/ena/ena_datapath.c b/sys/dev/ena/ena_datapath.c index 85e9274eef14..97761c86825f 100644 --- a/sys/dev/ena/ena_datapath.c +++ b/sys/dev/ena/ena_datapath.c @@ -90,8 +90,8 @@ ena_cleanup(void *arg, int pending) ena_qid = ENA_IO_TXQ_IDX(qid); io_cq = &adapter->ena_dev->io_cq_queues[ena_qid]; - tx_ring->first_interrupt = true; - rx_ring->first_interrupt = true; + atomic_store_8(&tx_ring->first_interrupt, true); + atomic_store_8(&rx_ring->first_interrupt, true); for (i = 0; i < CLEAN_BUDGET; ++i) { rxc = ena_rx_cleanup(rx_ring);