From nobody Wed Jun 12 19:16:43 2024 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 4VzwJX1GSVz5NHbY; Wed, 12 Jun 2024 19:16:44 +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 4VzwJW6qC3z56c9; Wed, 12 Jun 2024 19:16:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718219804; 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=bgXisdiLrz8/MJSdl5/f2alnmx1vxk7BalmPdQpwcag=; b=cz/auIlqS2RIuwcTnRU92YjmZPhK4CLYSZny0dgO2M/rpGzYMNYHwk8CGVVXzFj1oTgQb2 9HPW4neXKn4+rm81PVdQmNh/V3+JBjZXFvmRWIpIyiheaqDxDYNRHRrcPM1eaj1vjw4xfm w1IQUHwN4Z+XAr3S2IRae7TUKn/3Nc+knkqLY20MCVMD2py0FthMrrreqj8SMK8oaQeq7t BNAeYKq6e+ktbNghs4ttwVxtVX65wtXRwhAYhw6g7drPvjmjZ5LkY32QbtCkT9MHCFVrcY vEegl6K4lArjqsFlpecGmSGy0Zao2hj1887BWOVREHtlHYfrZqQBzVs8ZE6PuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718219804; a=rsa-sha256; cv=none; b=XsYDBX/NT79sgLUsSvKD2I2fmIyX1OyPUkb5xpB9a0vLPXaFVIkGVx+Z7RQARoLLpwEdaL rxZtyk26JlP8FZvju7m9bmwefLm/USrhsssGFGIto4BlVWfI7GVCK0fMDMfka8WOsDFuze 5xCqmtcUJ+L7UfixGY2QuJo5e9kJWmWQyjQGTEw7v/AUuXMPTiybtttMqGRJNKZ0gubkK9 hUza7fmhaThcLnczkNHH+FjI1NkmhqBr7tYq6uKzjJl4YaCD+qVAMnvGpAsRPXXWiiOsFb jxYb7T62or5d9mGRo2JBxROWIAOatOITV1WI62vMWoaIfL3pPDDcO7gwh5UeRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718219804; 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=bgXisdiLrz8/MJSdl5/f2alnmx1vxk7BalmPdQpwcag=; b=BfLfIwwrlEmbgw1BHxM7y7wqRcW9/FS419M0xKhaAGrCKP++FN9uOSIYa4nkd7sg4HVU/N cxsM1VVVsVCelELWdWir18pBNac9V3Q2M9MWedFbDyKLfTdMZRrc+3O5G7dMzQpvHBosDU xFGs6l66+2NzYFA75psH9t8DmSpfJ5RNgIAQPzHqdw1RiN4+IAmBXaNaDUWPNrbxddk1vn ut0VKeJHF5RZ/C+Yc6QTu2eklaEOy96qpcq1Mjj4PtP9kWW8EYoSOTCDOGwYST4SxXQtMU NDdANJK/hNYUivZB2DYPYV7aSmXt29gm+VGboLvRy/ZjK8vXcDv4VdgCSUpNBA== 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 4VzwJW6QtCz14xG; Wed, 12 Jun 2024 19:16:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45CJGhUr003854; Wed, 12 Jun 2024 19:16:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45CJGhZj003851; Wed, 12 Jun 2024 19:16:43 GMT (envelope-from git) Date: Wed, 12 Jun 2024 19:16:43 GMT Message-Id: <202406121916.45CJGhZj003851@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 4d9e8a65d031 - stable/13 - LinuxKPI: napi_schedule() requires return value, implement napi_is_scheduled() 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4d9e8a65d0318efbd3bc6b427c1580cd3c8200a4 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=4d9e8a65d0318efbd3bc6b427c1580cd3c8200a4 commit 4d9e8a65d0318efbd3bc6b427c1580cd3c8200a4 Author: Bjoern A. Zeeb AuthorDate: 2024-03-31 17:27:45 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-06-12 16:57:33 +0000 LinuxKPI: napi_schedule() requires return value, implement napi_is_scheduled() A newer version of iwlwifi requires a return value from napi_schedule(); unclear if the function always should have been bool. Add the bool to test based on the napi_schedule_prep() result. Also add napi_is_scheduled() for rtw89. Sponsored by: The FreeBSD Foundation Reviewed by: emaste (previous version) Differential Revision: https://reviews.freebsd.org/D44591 (cherry picked from commit 21761f2ede4ebad13e78112b9409c1f20f946781) --- sys/compat/linuxkpi/common/include/linux/netdevice.h | 9 ++++++++- sys/compat/linuxkpi/common/src/linux_netdev.c | 8 ++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/netdevice.h b/sys/compat/linuxkpi/common/include/linux/netdevice.h index 02734585bf63..12ff307b3ce4 100644 --- a/sys/compat/linuxkpi/common/include/linux/netdevice.h +++ b/sys/compat/linuxkpi/common/include/linux/netdevice.h @@ -233,7 +233,7 @@ void linuxkpi_netif_napi_add(struct net_device *, struct napi_struct *, void linuxkpi_netif_napi_del(struct napi_struct *); bool linuxkpi_napi_schedule_prep(struct napi_struct *); void linuxkpi___napi_schedule(struct napi_struct *); -void linuxkpi_napi_schedule(struct napi_struct *); +bool linuxkpi_napi_schedule(struct napi_struct *); void linuxkpi_napi_reschedule(struct napi_struct *); bool linuxkpi_napi_complete_done(struct napi_struct *, int); bool linuxkpi_napi_complete(struct napi_struct *); @@ -275,6 +275,13 @@ netif_napi_add_tx(struct net_device *dev, struct napi_struct *napi, netif_napi_add(dev, napi, napi_poll); } +static inline bool +napi_is_scheduled(struct napi_struct *napi) +{ + + return (test_bit(LKPI_NAPI_FLAG_IS_SCHEDULED, &napi->state)); +} + /* -------------------------------------------------------------------------- */ static inline void diff --git a/sys/compat/linuxkpi/common/src/linux_netdev.c b/sys/compat/linuxkpi/common/src/linux_netdev.c index 61ebcdbf7a39..61342395f03c 100644 --- a/sys/compat/linuxkpi/common/src/linux_netdev.c +++ b/sys/compat/linuxkpi/common/src/linux_netdev.c @@ -185,7 +185,7 @@ linuxkpi___napi_schedule(struct napi_struct *napi) } } -void +bool linuxkpi_napi_schedule(struct napi_struct *napi) { @@ -195,8 +195,12 @@ linuxkpi_napi_schedule(struct napi_struct *napi) * iwlwifi calls this sequence instead of napi_schedule() * to be able to test the prep result. */ - if (napi_schedule_prep(napi)) + if (napi_schedule_prep(napi)) { __napi_schedule(napi); + return (true); + } + + return (false); } void