From nobody Tue Mar 28 21:58:40 2023 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 4PmNqN3jKMz42V33; Tue, 28 Mar 2023 21:58:40 +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 4PmNqN3Bpqz3GMN; Tue, 28 Mar 2023 21:58:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680040720; 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=o9TIdmVyWV0/bkUSp/AMpYMzWilJw8ACyOVnuAnqhz0=; b=XI/kEIjv5mkYbm+rRhMjA9ZeAc/xxW/rBWn1QrJdttroccHpnvvpZwogNKat0TD2DduWkZ pTtkFcaWzFjkH2+jJXWM1FGt5zl9g7TTDJ6NrmGyhcvYvBC9TqLtmQVstRkfkB+Luig0x1 g7uVoSTgrGMARSmRIuBZ+3i8PcoHBVUmwYtDc/rIFgKuLdo/cQYCwy5aBaEAMkwcEEIrso Pds0SafPIR5kGluR7I8txUlZDJRflFlGKFF4Gw2T8Muz144BON9E9a0y9VSMY7h4fqp85G cDy19qazLk+4kZIZECGJ2XUnQiLxrWpIqrRw5SWKq+R+Hd2pXvC+Qb7LPmvR0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680040720; 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=o9TIdmVyWV0/bkUSp/AMpYMzWilJw8ACyOVnuAnqhz0=; b=cFZJgNglvJeO9HrkzZBJuxlFvdV3+51GyUDNx/+2zZ+80gAnoB/T+B2gKhizz08Qu5a/Nu iL/jVpHGdZHdfpPSzfskHTiZYZJmGx8Y0dFjopRTzyUteL61slfOVut4cX8TmmLm+wFrMT c1VoZIScbpuqknFAejHnAj3jyFv9iB35uV9xD63yRyJyBRCqbB5n0HVuoGN9ll1rOm6FMn PUucSUYzg33vqtKsAPta5LSBp+4Q44K2L4BBdSUymJG7UFwIw/76QJukqm0vIS8I5m+8eU 4AzAyZfG8V8E6tA+PGIvLC/muxgN/AZXQAmL72OCUuEYT6dHF7klTjOjIIcjTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680040720; a=rsa-sha256; cv=none; b=UDlmqj8MnbxT5q4eFRF3mkCfWs39mczfGIIKSHKRxFKRfcW02hNhsU2koR/MYIXxwPWZwP 52Wv13SfalXo6kaTcQHkU2ObcD57q+U2PQbGWWowicYXlBSmBvKoCmeSH1nL0CXzZB/Uxg BlOP7nOGW9EWxYgH5H9mZT8w+NNM/N4W54obazYTfQ3BdLeUi8PQ++mshQCh2bnmnYF9iX FVY63LaPdjjUYzzxUP+6gd9Gc0jzWqu4VwLPXnAkaZoyOjVeOF2706LwHrL8ZXbtM7TwxE g2IvNRZg/o0NG9v/DQHTnyg93tJl37GYDTjCa1NMQpMO4aTqBGRISkQA5IgZvg== 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 4PmNqN1xRDz1Jyt; Tue, 28 Mar 2023 21:58:40 +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 32SLwe8f064794; Tue, 28 Mar 2023 21:58:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32SLwegO064793; Tue, 28 Mar 2023 21:58:40 GMT (envelope-from git) Date: Tue, 28 Mar 2023 21:58:40 GMT Message-Id: <202303282158.32SLwegO064793@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vincenzo Maffione Subject: git: 1e01c7ed6281 - stable/13 - netmap: get rid of save_if_input for emulated adapters 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: vmaffione X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1e01c7ed628161e1eb46dfb97b3a8c74dbb7e8db Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by vmaffione: URL: https://cgit.FreeBSD.org/src/commit/?id=1e01c7ed628161e1eb46dfb97b3a8c74dbb7e8db commit 1e01c7ed628161e1eb46dfb97b3a8c74dbb7e8db Author: Vincenzo Maffione AuthorDate: 2023-03-14 21:59:23 +0000 Commit: Vincenzo Maffione CommitDate: 2023-03-28 21:58:26 +0000 netmap: get rid of save_if_input for emulated adapters The save_if_input function pointer was meant to save the previous value of ifp->if_input before replacing it with the emulated adapter hook. However, the same pointer value is already stored in the if_input field of the netmap_adapter struct, to be used for host TX ring processing. Reuse the netmap_adapter if_input field to simplify the code and save some space. MFC after: 14 days (cherry picked from commit 6c9fe357435db6408ec6b01221b9ff9e7e9b0ff1) --- sys/dev/netmap/netmap_freebsd.c | 20 ++------------------ sys/dev/netmap/netmap_kern.h | 3 --- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/sys/dev/netmap/netmap_freebsd.c b/sys/dev/netmap/netmap_freebsd.c index b9055d589df1..19708406dc93 100644 --- a/sys/dev/netmap/netmap_freebsd.c +++ b/sys/dev/netmap/netmap_freebsd.c @@ -327,9 +327,7 @@ freebsd_generic_rx_handler(struct ifnet *ifp, struct mbuf *m) stolen = generic_rx_handler(ifp, m); if (!stolen) { - struct netmap_generic_adapter *gna = - (struct netmap_generic_adapter *)NA(ifp); - gna->save_if_input(ifp, m); + NA(ifp)->if_input(ifp, m); } } @@ -346,24 +344,10 @@ nm_os_catch_rx(struct netmap_generic_adapter *gna, int intercept) nm_os_ifnet_lock(); if (intercept) { - if (gna->save_if_input) { - nm_prerr("RX on %s already intercepted", na->name); - ret = EBUSY; /* already set */ - goto out; - } - gna->save_if_input = ifp->if_input; ifp->if_input = freebsd_generic_rx_handler; } else { - if (!gna->save_if_input) { - nm_prerr("Failed to undo RX intercept on %s", - na->name); - ret = EINVAL; /* not saved */ - goto out; - } - ifp->if_input = gna->save_if_input; - gna->save_if_input = NULL; + ifp->if_input = na->if_input; } -out: nm_os_ifnet_unlock(); return ret; diff --git a/sys/dev/netmap/netmap_kern.h b/sys/dev/netmap/netmap_kern.h index 195b5de7a502..237b2b39047a 100644 --- a/sys/dev/netmap/netmap_kern.h +++ b/sys/dev/netmap/netmap_kern.h @@ -987,11 +987,8 @@ struct netmap_generic_adapter { /* emulated device */ struct netmap_adapter *prev; /* Emulated netmap adapters support: - * - save_if_input saves the if_input hook (FreeBSD); * - mit implements rx interrupt mitigation; */ - void (*save_if_input)(struct ifnet *, struct mbuf *); - struct nm_generic_mit *mit; #ifdef linux netdev_tx_t (*save_start_xmit)(struct mbuf *, struct ifnet *);