From nobody Sun Mar 20 05:20:20 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 68C1B1A1C1F3; Sun, 20 Mar 2022 05:20:20 +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 4KLmKc2WhRz4VLL; Sun, 20 Mar 2022 05:20:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647753620; 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=4fLjsBNnRpxR9dGSjnG7ZYmGdMHTnscSbdWplGJioDM=; b=EeqJhY/AumnKI0fvx246jmorBTkrnIRuVPEFdFg7PGoE52UYoEUKyif7fDgh+ttYsP109t Ay3AgZnsQK5HGBLgvUEHDrP1pdWl34EhB8ba81Tn16l68pW+sxJyZ2TJc7HzZfR8XGBLwc CorggMj31N2Zmp2QH+o47rlxXCpy0EZPdGaZ9FuaDZAeFuBYnp+fxHwpEU07vsGUWSeGAO MWAfnBdkKHOJNtY31MPl31N9fjOoYW9ZDvAjzCsYp9akRVxpXaTrFpl1RQJ2k81oQUD9qy DYHn6xM4M3Gj8uBwbZcg2bcX2lRjZGkLa9dP9Ovsb7mOJ+IbxRfx8kpq1Zq14A== 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 362CC210D1; Sun, 20 Mar 2022 05:20:20 +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 22K5KKxW027921; Sun, 20 Mar 2022 05:20:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22K5KKdm027918; Sun, 20 Mar 2022 05:20:20 GMT (envelope-from git) Date: Sun, 20 Mar 2022 05:20:20 GMT Message-Id: <202203200520.22K5KKdm027918@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: f6138d93b511 - stable/13 - if_epair: build fix 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f6138d93b5115ff560b24200d1ea002cdc46bb64 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647753620; 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=4fLjsBNnRpxR9dGSjnG7ZYmGdMHTnscSbdWplGJioDM=; b=unFzTi6g/8a/SEZYwEtHv7V3dED/zZzTn1VLc2IVALmUPg9ZY9FBttLV83szyM3igoATSS I0Ad2a2d7CBPqirmAGcuuamjhFcH3RLli1ztv933CA9rZMrRuwP+SvNyqdhgv9RDS8/4dU HqJh0CfipAjqhdM9PKXM8H7T1XP6cSJMDXhbM8fWuyA2Mgtf71Lf3RnGXDOSQpltCx/tbe /g+8G3hsX5u3hW058uKGNB25MIGkCUfbIi8TQwX1kggz57BqGfpLQhowHbs9nrGwrSHB8D hVT9MirgddvYsA6/lOJ4h/EeaFf6nwj6FBU7NtgF6+f8YH8OgqWPDuhLPusYdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647753620; a=rsa-sha256; cv=none; b=EIFmrvVminvkXTxdmbB9qLKZAwlALynsM+wPK7s7HOaQ061eAizsqVhGuEL1Fh31qqQZrF jd8VaGSRTmYrH6fVJh9K9ynPwAMAWDKaPvVJAYspsm8vcNXuckKZ/CG30zzGtoLEDJyN6I 21bC8jo+thpa1UqF//EWDdfM0OhrglyMUSt1tiRhCqFv3AmEf7/qQaW6PWWu13aK5WQzoZ MYBUtxoO7YRdFhRS7PB2wHm9YH8iANURasvhbif/o7UOtygKSt/3ctpUf75bNaE9CerARN fORDJDRfKZQDq+0F0Dg8UHXHgfmws2TWAwmV66d01THBDaoEz33GNsGs+pyGRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=f6138d93b5115ff560b24200d1ea002cdc46bb64 commit f6138d93b5115ff560b24200d1ea002cdc46bb64 Author: Kristof Provost AuthorDate: 2022-03-17 02:35:13 +0000 Commit: Kristof Provost CommitDate: 2022-03-20 00:25:03 +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 (cherry picked from commit 0bf7acd6b7047537a38e2de391a461e4e8956630) --- 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 d8f51c951913..ef9be94285bc 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);