From nobody Tue Feb 22 23:53:52 2022 X-Original-To: dev-commits-src-branches@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 152C919CE4B0; Tue, 22 Feb 2022 23:53:53 +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 4K3GGT06Hvz4Rly; Tue, 22 Feb 2022 23:53:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645574033; 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=2mqKvor6NsRf6fSeKzKCx0Pee+MvAzQwS7hmDN9PqFE=; b=h6WXHqZxZxWDloFlFXsGArdDmkquFuA8Ch69F9vRBZ6hPC6nvaJbchBG8tAddGTDqKhNQF gr+nFB5yqhO0g25MfqyaZNtguynRiJRG3msM9wy+4vfk8IHaWXNx9ry/0FRT9ey1zUfHAv OEgzcgSlFUNFkf5EZTCZlY+P49B5WppjdLQdgUS3MfMmYtVJjVLxwZblCpx06NZwwkFdxm XU04smSdZbmwGeVwFOQ2GyElmmpKR/5jYQFrOuPgCrR0F9qgihvBey0zuJZMhlBj6l9SXn eNO+jpxi4gzJWEDpu327jeFVHae6mumnXmo90b/RXBhSUEMcCIcUYnlqg6PccQ== 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 D7E465B6A; Tue, 22 Feb 2022 23:53:52 +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 21MNrq6N051068; Tue, 22 Feb 2022 23:53:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21MNrqtR051067; Tue, 22 Feb 2022 23:53:52 GMT (envelope-from git) Date: Tue, 22 Feb 2022 23:53:52 GMT Message-Id: <202202222353.21MNrqtR051067@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 257cd2f8c3c5 - stable/13 - if_oce: fix epoch handling List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 257cd2f8c3c5f43dc6c16d49bea731d4c872ebec Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645574033; 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=2mqKvor6NsRf6fSeKzKCx0Pee+MvAzQwS7hmDN9PqFE=; b=VuwufL7oM48ceMy9UWKQ4v5zRBOSbdvxjF8rO1JS/Bz8prRoi36M9DYJ8Ofbjh8J+7+Kos GFRJAPUhiZzh1u6l7t4Z5Z/J8+3/3sgpqTFsky5+BoTGmy0YzP6U/zF9kjGMB7dc6j1UiA JgQm9llHEhE+HYB+/PsP+Yft6dwiw8cRlANCukBSkHdjGAlMYTTsgMSHheNEqStqqudVQk 7ohCDD0jZRENhc67LwmmnTISMxVq6CYlevjcDNMAoqCKLJMCSkrjk6z3cAvPs6r0GznLnM VedmFISUfhicd/ddni1yPlkLUiVVPfLGXDrCmtiJj4nC00nl4eojqBIQNyqc2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645574033; a=rsa-sha256; cv=none; b=nFmp/46l/J9cZA922kRyMhAd+Pf7B5wfs6hYC4LZEnvvfxg0GLETEc9CDhEsfMPTT+hfGR WQnNI4ZzG4+kNb16qvwbgbsTKZlO5eDGD70r0XuJqY7FufWGvmoRKedzuk2Er2CELu9KRx q/1R0CnSvvT++h3apbFjG4nXFDr14p41UmqSEBPApL9akiLBxxZv/67DezbXlVPYIST55c xht5UTVpVrFUxi+YzaaXiaspnxZFHyyKsqXL+RCrkgKOG0ynjPYl3inTKTL7DPsSATnIJp 1MjJIp3BJyMY9fWI5k6uwOxL9wy56/TmQAQ2v10ty9ci7A4mkVW4uCRbtOlt2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=257cd2f8c3c5f43dc6c16d49bea731d4c872ebec commit 257cd2f8c3c5f43dc6c16d49bea731d4c872ebec Author: Michael Tuexen AuthorDate: 2021-12-18 22:43:00 +0000 Commit: Michael Tuexen CommitDate: 2022-02-22 23:52:15 +0000 if_oce: fix epoch handling Thanks to gallatin@ for suggesting the patch. PR: 260330 Reported by: Vincent Milum Jr. Reviewed by: gallatin, glebius Tested by: Vincent Milum Jr. Differential Revision: https://reviews.freebsd.org/D33395 (cherry picked from commit e363f832cfb283a543fa8e47ebd9e51817994fde) --- sys/dev/oce/oce_if.c | 6 +++++- sys/dev/oce/oce_if.h | 1 + sys/dev/oce/oce_queue.c | 5 ++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/sys/dev/oce/oce_if.c b/sys/dev/oce/oce_if.c index 271c35015a9f..1127565282c1 100644 --- a/sys/dev/oce/oce_if.c +++ b/sys/dev/oce/oce_if.c @@ -2039,14 +2039,17 @@ exit_rq_handler_lro: uint16_t oce_rq_handler(void *arg) { + struct epoch_tracker et; struct oce_rq *rq = (struct oce_rq *)arg; struct oce_cq *cq = rq->cq; POCE_SOFTC sc = rq->parent; struct oce_nic_rx_cqe *cqe; int num_cqes = 0; + NET_EPOCH_ENTER(et); if(rq->islro) { oce_rq_handler_lro(arg); + NET_EPOCH_EXIT(et); return 0; } LOCK(&rq->rx_lock); @@ -2090,6 +2093,7 @@ oce_rq_handler(void *arg) oce_check_rx_bufs(sc, num_cqes, rq); UNLOCK(&rq->rx_lock); + NET_EPOCH_EXIT(et); return 0; } @@ -2110,7 +2114,7 @@ oce_attach_ifp(POCE_SOFTC sc) ifmedia_add(&sc->media, IFM_ETHER | IFM_AUTO, 0, NULL); ifmedia_set(&sc->media, IFM_ETHER | IFM_AUTO); - sc->ifp->if_flags = IFF_BROADCAST | IFF_MULTICAST; + sc->ifp->if_flags = IFF_BROADCAST | IFF_MULTICAST | IFF_KNOWSEPOCH; sc->ifp->if_ioctl = oce_ioctl; sc->ifp->if_start = oce_start; sc->ifp->if_init = oce_init; diff --git a/sys/dev/oce/oce_if.h b/sys/dev/oce/oce_if.h index 8938dd86ecce..c7386aab68f8 100644 --- a/sys/dev/oce/oce_if.h +++ b/sys/dev/oce/oce_if.h @@ -42,6 +42,7 @@ #include #include +#include #include #include #include diff --git a/sys/dev/oce/oce_queue.c b/sys/dev/oce/oce_queue.c index 04c92a5f397b..da4d33065d40 100644 --- a/sys/dev/oce/oce_queue.c +++ b/sys/dev/oce/oce_queue.c @@ -1233,13 +1233,15 @@ oce_rx_cq_clean(struct oce_rq *rq) void oce_stop_rx(POCE_SOFTC sc) { + struct epoch_tracker et; struct oce_mbx mbx; struct mbx_delete_nic_rq *fwcmd; struct mbx_delete_nic_rq_v1 *fwcmd1; struct oce_rq *rq; int i = 0; - /* before deleting disable hwlro */ + NET_EPOCH_ENTER(et); + /* before deleting disable hwlro */ if(sc->enable_hwlro) oce_mbox_nic_set_iface_lro_config(sc, 0); @@ -1274,6 +1276,7 @@ oce_stop_rx(POCE_SOFTC sc) UNLOCK(&rq->rx_lock); } } + NET_EPOCH_EXIT(et); } int