From nobody Tue Jul 26 19:31:03 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 4Lsn875W3Cz4Wwn9; Tue, 26 Jul 2022 19:31:03 +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 4Lsn873Jp7z430s; Tue, 26 Jul 2022 19:31:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658863863; 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=0MuTLq9GosYgfNmmi89j0BYTFxBB1sJ5Q7WIKGnDkLg=; b=w93D2pfmlhV+e3ya8p9Cqkveazk5TiJNNOeieWQRjly9DWoSxzer4WVCH6sVO8CE9swrFW xrLIBXnY54h0NSlNc8vfsyTk8hqMcOSbInQwM+dVrKCw0ACbmFdZTyFh9Bpa8LL/DSVxtH 4OmHRJ+UYjt532RpiXn/3p8TDgNixl1JnAmhDCWTms5tdXIY+G7WVwaWo60uWVuLsVor6k drzvNSmJHb1k1ftdEI29zlp+uKG86Tv0ipKakt7FDeB5PZ/VwpTdVHvULvFLt6nCf9ThB7 eLaH4CxgpVkblMCAkh9l8c50ha7S05jRXFZt1qAcwRr5wp3/Y7XiHNBBN/A2Yg== 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 4Lsn8728Dfzp5r; Tue, 26 Jul 2022 19:31:03 +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 26QJV3km029866; Tue, 26 Jul 2022 19:31:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26QJV3ds029865; Tue, 26 Jul 2022 19:31:03 GMT (envelope-from git) Date: Tue, 26 Jul 2022 19:31:03 GMT Message-Id: <202207261931.26QJV3ds029865@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: d91776d81bb2 - stable/13 - ena: Make first_interrupt a uint8_t 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: d91776d81bb2f44b994905f3aeaedaecbfead93a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658863863; 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=0MuTLq9GosYgfNmmi89j0BYTFxBB1sJ5Q7WIKGnDkLg=; b=hmUWugAGdUKArpxUqFTh69LXJw+ehuMc+QH2amseeVrZ9zkBrz85hfoPZoV3rH2ZHMq587 KtFVY2MRZNHPRi1dSKUYrsw7KxQBJXU9Ms5QcfknFA4tDfY+OQt8aMzc5GmLHfCJKwTxlw /IOnb4WSG+d2o/KEdue9NyYsVqKqzxjFT33IxWyDTMWLRybGbc0EL4MNHJ2TLERIZaQRTu BJqwKZY1gL5rrQEJyw38hTiIfNc8H9v9W0zb0QNO3zERtA/b75TyuQq57UgE/fAjwVZ/jt hQHglZkHR0QgzLVkv9xRfrnTgNLcbhSqFaGxLAdzYvpDEOmhzehW9AvZ91KOSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658863863; a=rsa-sha256; cv=none; b=FbnXmhxAYMv8dw1mmPLTtmCSoiUIhNB0+ory1+fApmwPl6sr7VH+TVvbti8JcmsGk3oty+ 7IAZIouKG60l7NtksfgVE7agbv5ovxd4pR2O6Btp2iqVyb2m/2bejna6IfGZwbbqkUigpK HlHkgvL9JreMEDetnBc4y1AeaJPDaeYrWl+55S9Q/qdkbV+zKK+tZR0QljUf/qpkxbtev/ kwwSE5iGqyGciUlb3rIsxWv4gHR3xrZMPpcNaQt7o5xD7VIUJp1d3X9gqZWJmMViYxmeMK s4Gflwpr2kPLAYyzcL2r9dEw5Sz2+Kh5RS4t1nA4bGl/BnMy9rjLe9uxnGtP9g== 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=d91776d81bb2f44b994905f3aeaedaecbfead93a commit d91776d81bb2f44b994905f3aeaedaecbfead93a Author: Mark Johnston AuthorDate: 2022-06-30 18:49:46 +0000 Commit: Marcin Wojtas CommitDate: 2022-07-26 19:30:17 +0000 ena: Make first_interrupt a uint8_t We do not have atomic(9) routines for bools, and it is not guaranteed that sizeof(bool) is 1. This fixes the KASAN and KMSAN kernel builds, which fail because the compiler refuses to silently cast a _Bool * to a uint8_t * when calling the atomic(9) sanitizer interceptors. Reviewed by: Dawid Górecki MFC after: 2 weeks Fixes: 0ac122c388d9 ("ena: Use atomic_load/store functions for first_interrupt variable") Differential Revision: https://reviews.freebsd.org/D35683 (cherry picked from commit b72f1f4516896ad6da0ea74d146a56045de171f7) --- sys/dev/ena/ena.c | 2 +- sys/dev/ena/ena.h | 2 +- sys/dev/ena/ena_datapath.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/dev/ena/ena.c b/sys/dev/ena/ena.c index 3f2aa1ffcd49..ad4fa357e595 100644 --- a/sys/dev/ena/ena.c +++ b/sys/dev/ena/ena.c @@ -376,7 +376,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; - atomic_store_8(&ring->first_interrupt, false); + atomic_store_8(&ring->first_interrupt, 0); ring->no_interrupt_event_cnt = 0; } diff --git a/sys/dev/ena/ena.h b/sys/dev/ena/ena.h index 4e1f75cd8f9a..f79e311fc88d 100644 --- a/sys/dev/ena/ena.h +++ b/sys/dev/ena/ena.h @@ -329,7 +329,7 @@ struct ena_ring { }; - bool first_interrupt; + uint8_t first_interrupt; uint16_t no_interrupt_event_cnt; struct ena_com_rx_buf_info ena_bufs[ENA_PKT_MAX_BUFS]; diff --git a/sys/dev/ena/ena_datapath.c b/sys/dev/ena/ena_datapath.c index c4c9ad3403c6..1bd901a30059 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]; - atomic_store_8(&tx_ring->first_interrupt, true); - atomic_store_8(&rx_ring->first_interrupt, true); + atomic_store_8(&tx_ring->first_interrupt, 1); + atomic_store_8(&rx_ring->first_interrupt, 1); for (i = 0; i < ENA_CLEAN_BUDGET; ++i) { rxc = ena_rx_cleanup(rx_ring);