From nobody Thu Jun 30 16:15:36 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 B91068A3B40; Thu, 30 Jun 2022 16:15:37 +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 4LYk2c4rShz3QVl; Thu, 30 Jun 2022 16:15:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656605736; 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=xL6DcEdN91QGEPL9MVFmtoHiM752pLEwSE9+HBEsvhE=; b=YhnFnadhino1EFC9xcPJ7xDIhQUd/0j3YbzzQ9cyEkwa2V1vkemsTZiJhE+L1u7rHI94Ns 5bimGmnWU83iJxb2HEn2/XbNwzwoQKRkGLFOefII9RENuKhCvFp38c7LXyvsZZEry5cZ52 pUWPn09Dx4hkg6GoPLS0b94qRH5AKUfnSjm0TbZ3BnSOihhEIDhNZmLzIYMmf4QzGW1s4n 7liH97cD4+Nf/2nSw/v4fyysfAFVHjOSnsit9FwjZzGyfrPWvNjMzrt+guAWri70RtMJQP YNhDXbR4G47fGu0iFONlRwy2HVlIg+WO7JRGjXutu5RrZARayUxwVZN/w+T+Ew== 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 70DA31477; Thu, 30 Jun 2022 16:15:36 +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 25UGFa3D014817; Thu, 30 Jun 2022 16:15:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25UGFae0014816; Thu, 30 Jun 2022 16:15:36 GMT (envelope-from git) Date: Thu, 30 Jun 2022 16:15:36 GMT Message-Id: <202206301615.25UGFae0014816@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Marcin Wojtas Subject: git: 0ac122c388d9 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 0ac122c388d9a5e189e60378f1950b82a22bbdd1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656605736; 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=xL6DcEdN91QGEPL9MVFmtoHiM752pLEwSE9+HBEsvhE=; b=uJPw/P0AA3D430Ia0PRlUd7b3TZHbweZa2tDmqGXe5mFHd+jzbWflHV8QL/Nzqnb3hogj1 jRHaDZ2Ixp/vAjrbeDGLVMP6f9IncPAhNFV08UAtEJtsetMxxG6fS6brWQuUJR8XOGwOtD 8sMlR2A9BfVJp3jAVGILUPDWcFTTHuHemxk3bqDj6M9lNU4LklvwOOZSpfVQ4sE62W6fOY c5jt+aYGAG5Cx5817g7if3TftJSWOacHHrrmBEIGam1me0U+pVIzYyuHb3I52kFeiy2BdY VnSPyCHd73lp3mpGJQPV0Eh4ASFh/FJF3v0d4HDddOw9bf8SkJi6KQHC3vLUsA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656605736; a=rsa-sha256; cv=none; b=sNKbVU+JNS/FtAvUlBDQ6UzWnqVVPhNGCnuQXd8+NUBxS7EtG4dSDOVeNImIeDoHH59/GO tayGgrjdyI+zYnTk+3/8r6zMGqwxH8pKA+D4l3bFdhEXCG7m7+/m1xBhD/7kuVK5noHTen A8WxSovM24GgPaQtAF1WoOCyioCtMOJShHQVf9CLTr/xpH/70cbRxEYQcjvI5zt3cl0jQ9 R/rPsF0zYxMOG5yIbdZEg4ZPHl9xQTkmFGa2iwJylIuSjoPzB1LRMBp0Eoig0RmrcZgQkm /oD+GH80l/D9KQ1+FqvNXXGS92oSlws/0gre+Z5qC26SGwjXraVDoYbQR/vGGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mw: URL: https://cgit.FreeBSD.org/src/commit/?id=0ac122c388d9a5e189e60378f1950b82a22bbdd1 commit 0ac122c388d9a5e189e60378f1950b82a22bbdd1 Author: Dawid Gorecki AuthorDate: 2022-06-10 09:18:09 +0000 Commit: Marcin Wojtas CommitDate: 2022-06-30 15:31:49 +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. --- 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 b4b38051b035..ab9bb177ee25 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);