From nobody Thu Mar 17 05:44:30 2022 X-Original-To: dev-commits-src-main@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 2E3101A280CE; Thu, 17 Mar 2022 05:44:31 +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 4KJx0v0kLYz4ndr; Thu, 17 Mar 2022 05:44:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647495871; 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=qM95peJWasBglD281xP8O2tKKkQZx5eFjUKC1vZGN0s=; b=H8EU/Y4uBzFDRv3XfXbJ+TzNNLvLX2AcZLMDL836YoStNga3Mu3ueeWNr4QE5z8lFXE+vX KAclLHeT9seln2C5s0Cvz5XIZmgZPFhRuSZLqtFlEgjzgpuepPupfZcVz3rHQH2ARTORde 72ONAosobAfl30doXNVsPDQq7Iwugegcy+8mtknhGp9DsS1bUcui6rCs+xbTjsmpUZKtFU aePFRzBlH4APWlEacXq5Qo9BoHrzB0tQiY6koodMOKDTUjGn6rtqpmEl823IeZlFcU5Acq Peb/2kfopMksqcT/YytUQk35csmspbWTiy7RUYsD9b1H3PZu4e9c6sOUihiOrw== 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 ECC7A24BC9; Thu, 17 Mar 2022 05:44:30 +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 22H5iU8L045359; Thu, 17 Mar 2022 05:44:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22H5iUNl045358; Thu, 17 Mar 2022 05:44:30 GMT (envelope-from git) Date: Thu, 17 Mar 2022 05:44:30 GMT Message-Id: <202203170544.22H5iUNl045358@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 0bf7acd6b704 - main - if_epair: build fix List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0bf7acd6b7047537a38e2de391a461e4e8956630 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647495871; 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=qM95peJWasBglD281xP8O2tKKkQZx5eFjUKC1vZGN0s=; b=T5EUdnsTykUm36huqzwiByA+h86ZD/gGkBBmqlCtr+WwXzDNLN4iI5SgO49Pq9arR8BV+t oSTvmCEv7bKF4Iumu5sWyRm26LY1d5Y/TxxFayNiMsZ9PLVI6QIY4ykIXia2QUsAvFQ5fH qTIP7b4lz6bVlFCh488BK6B8OdSQn3SMxZ6QShAgvG2izIoEBA6hi6rbuusYHP1q1DFswA xLm8CgXP774QOuvMYzzUiMl0+9c9AnUKNAP0Eq3niWyYtKY+/UCXnTfK9NLVA3pzvQgIPS /YTasNfD16XlrpmEwiFzg9tYicCa8djZdDCG3A2LEzS2cPqCXiUvHPAEPGpzWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647495871; a=rsa-sha256; cv=none; b=e9eIWF5uLU95R88HCeda/k18f7zW2tfB22uSeX6zDw6O6Cge/KjsaErN4PI1C0Syoa25mb 6SZBLJx0YRolRpmqhUSwapJoCs/U0Y9iKs+KPAY7zLgtFyEJ/jYuXy8nQdmy5USYaMwLAM 8VMW+GY+0Wydye9XaYdebWuGhddLOvmhVI9Rn2pKOMKlXihMbdRD4SMyZfVPRxxp1OU6NS GP2kzi/QEWCSFNCwn6x09mokWNkJUteZKLeWZbVnwJEKlZ/W2xu1rw3xgkqXaJRa7+YZ6x qMMAh/TBJUJNnVozabdT6WCVi8F8ejbLofkXkPMKG29o67JXpJy1XpTIACpymg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=0bf7acd6b7047537a38e2de391a461e4e8956630 commit 0bf7acd6b7047537a38e2de391a461e4e8956630 Author: Kristof Provost AuthorDate: 2022-03-17 02:35:13 +0000 Commit: Kristof Provost CommitDate: 2022-03-17 05:43:47 +0000 if_epair: build fix 66acf7685b failed to build on riscv (and mips). This is because the atomic_testandset_int() (and friends) functions do not exist there. Happily those platforms do have the long variant, so switch to that. PR: 262571 MFC after: 3 days --- sys/net/if_epair.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/net/if_epair.c b/sys/net/if_epair.c index fbf48c7793ea..37b12797426c 100644 --- a/sys/net/if_epair.c +++ b/sys/net/if_epair.c @@ -112,7 +112,7 @@ struct epair_queue { int id; struct buf_ring *rxring[2]; volatile int ridx; /* 0 || 1 */ - volatile int state; /* taskqueue coordination */ + volatile long state; /* taskqueue coordination */ struct task tx_task; struct epair_softc *sc; }; @@ -181,8 +181,8 @@ epair_tx_start_deferred(void *arg, int pending) } while (!atomic_fcmpset_int(&q->ridx, &ridx, nidx)); epair_if_input(sc, q, ridx); - atomic_clear_int(&q->state, (1 << BIT_QUEUE_TASK)); - if (atomic_testandclear_int(&q->state, BIT_MBUF_QUEUED)) + atomic_clear_long(&q->state, (1 << BIT_QUEUE_TASK)); + if (atomic_testandclear_long(&q->state, BIT_MBUF_QUEUED)) taskqueue_enqueue(epair_tasks.tq[q->id], &q->tx_task); if_rele(sc->ifp); @@ -248,7 +248,7 @@ epair_menq(struct mbuf *m, struct epair_softc *osc) #endif q = &osc->queues[bucket]; - atomic_set_int(&q->state, (1 << BIT_MBUF_QUEUED)); + atomic_set_long(&q->state, (1 << BIT_MBUF_QUEUED)); ridx = atomic_load_int(&q->ridx); ret = buf_ring_enqueue(q->rxring[ridx], m); if (ret != 0) { @@ -270,7 +270,7 @@ epair_menq(struct mbuf *m, struct epair_softc *osc) /* Someone else received the packet. */ if_inc_counter(oifp, IFCOUNTER_IPACKETS, 1); - if (!atomic_testandset_int(&q->state, BIT_QUEUE_TASK)) + if (!atomic_testandset_long(&q->state, BIT_QUEUE_TASK)) taskqueue_enqueue(epair_tasks.tq[bucket], &q->tx_task); return (0);