From nobody Thu Dec 18 05:00:52 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C1019C25B47 for ; Fri, 27 Oct 2023 09:52:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345555AbjJ0JwE (ORCPT ); Fri, 27 Oct 2023 05:52:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54000 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230502AbjJ0JwA (ORCPT ); Fri, 27 Oct 2023 05:52:00 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 037A8E5 for ; Fri, 27 Oct 2023 02:51:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698400271; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=+J+pIKdzOxPew/Qi1A1+iGlEwJIRobC+pGNP7AL8MAg=; b=JMaWqSW+MchvU2WsNUk15dAISpsvDW60Aoi2priRhphRvOV7tyNYa6S0BWxryAyx7RWFJY xCeaGebRq9IGa1lgMjgogpHUjVFQ/I7pVfQkCI19HQeqT5xndUwuc4hLaK7WXw51TunbwW My7XGitRpbs5UMEdrfzs41wFSw3FAr4= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-609-qMx7CWhYOj-b3VPNPguuOg-1; Fri, 27 Oct 2023 05:51:05 -0400 X-MC-Unique: qMx7CWhYOj-b3VPNPguuOg-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D95163822E92; Fri, 27 Oct 2023 09:51:04 +0000 (UTC) Received: from swamp.redhat.com (unknown [10.45.225.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6C5CB40C6F79; Fri, 27 Oct 2023 09:51:03 +0000 (UTC) From: Petr Oros To: netdev@vger.kernel.org Cc: jesse.brandeburg@intel.com, anthony.l.nguyen@intel.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, intel-wired-lan@lists.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next] iavf: use iavf_schedule_aq_request() helper Date: Fri, 27 Oct 2023 11:51:02 +0200 Message-ID: <20231027095102.499914-1-poros@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use the iavf_schedule_aq_request() helper when we need to schedule a watchdog task immediately. No functional change. Signed-off-by: Petr Oros --- drivers/net/ethernet/intel/iavf/iavf_ethtool.c | 10 +++------- drivers/net/ethernet/intel/iavf/iavf_main.c | 15 +++++---------- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/drivers/net/ethernet/intel/iavf/iavf_ethtool.c b/drivers/net/e= thernet/intel/iavf/iavf_ethtool.c index 90397293525f71..fc8d75a30602cd 100644 --- a/drivers/net/ethernet/intel/iavf/iavf_ethtool.c +++ b/drivers/net/ethernet/intel/iavf/iavf_ethtool.c @@ -1447,10 +1447,9 @@ static int iavf_add_fdir_ethtool(struct iavf_adapter= *adapter, struct ethtool_rx iavf_fdir_list_add_fltr(adapter, fltr); adapter->fdir_active_fltr++; fltr->state =3D IAVF_FDIR_FLTR_ADD_REQUEST; - adapter->aq_required |=3D IAVF_FLAG_AQ_ADD_FDIR_FILTER; spin_unlock_bh(&adapter->fdir_fltr_lock); =20 - mod_delayed_work(adapter->wq, &adapter->watchdog_task, 0); + iavf_schedule_aq_request(adapter, IAVF_FLAG_AQ_ADD_FDIR_FILTER); =20 ret: if (err && fltr) @@ -1481,7 +1480,6 @@ static int iavf_del_fdir_ethtool(struct iavf_adapter = *adapter, struct ethtool_rx if (fltr) { if (fltr->state =3D=3D IAVF_FDIR_FLTR_ACTIVE) { fltr->state =3D IAVF_FDIR_FLTR_DEL_REQUEST; - adapter->aq_required |=3D IAVF_FLAG_AQ_DEL_FDIR_FILTER; } else { err =3D -EBUSY; } @@ -1491,7 +1489,7 @@ static int iavf_del_fdir_ethtool(struct iavf_adapter = *adapter, struct ethtool_rx spin_unlock_bh(&adapter->fdir_fltr_lock); =20 if (fltr && fltr->state =3D=3D IAVF_FDIR_FLTR_DEL_REQUEST) - mod_delayed_work(adapter->wq, &adapter->watchdog_task, 0); + iavf_schedule_aq_request(adapter, IAVF_FLAG_AQ_DEL_FDIR_FILTER); =20 return err; } @@ -1660,7 +1658,6 @@ iavf_set_adv_rss_hash_opt(struct iavf_adapter *adapte= r, rss_old->hash_flds =3D hash_flds; memcpy(&rss_old->cfg_msg, &rss_new->cfg_msg, sizeof(rss_new->cfg_msg)); - adapter->aq_required |=3D IAVF_FLAG_AQ_ADD_ADV_RSS_CFG; } else { err =3D -EEXIST; } @@ -1670,12 +1667,11 @@ iavf_set_adv_rss_hash_opt(struct iavf_adapter *adap= ter, rss_new->packet_hdrs =3D hdrs; rss_new->hash_flds =3D hash_flds; list_add_tail(&rss_new->list, &adapter->adv_rss_list_head); - adapter->aq_required |=3D IAVF_FLAG_AQ_ADD_ADV_RSS_CFG; } spin_unlock_bh(&adapter->adv_rss_lock); =20 if (!err) - mod_delayed_work(adapter->wq, &adapter->watchdog_task, 0); + iavf_schedule_aq_request(adapter, IAVF_FLAG_AQ_ADD_ADV_RSS_CFG); =20 mutex_unlock(&adapter->crit_lock); =20 diff --git a/drivers/net/ethernet/intel/iavf/iavf_main.c b/drivers/net/ethe= rnet/intel/iavf/iavf_main.c index b3434dbc90d6fe..7217ba018f6bbf 100644 --- a/drivers/net/ethernet/intel/iavf/iavf_main.c +++ b/drivers/net/ethernet/intel/iavf/iavf_main.c @@ -1060,13 +1060,12 @@ static int iavf_replace_primary_mac(struct iavf_ada= pter *adapter, */ new_f->is_primary =3D true; new_f->add =3D true; - adapter->aq_required |=3D IAVF_FLAG_AQ_ADD_MAC_FILTER; ether_addr_copy(hw->mac.addr, new_mac); =20 spin_unlock_bh(&adapter->mac_vlan_list_lock); =20 /* schedule the watchdog task to immediately process the request */ - mod_delayed_work(adapter->wq, &adapter->watchdog_task, 0); + iavf_schedule_aq_request(adapter, IAVF_FLAG_AQ_ADD_MAC_FILTER); return 0; } =20 @@ -1284,10 +1283,9 @@ static void iavf_up_complete(struct iavf_adapter *ad= apter) =20 iavf_napi_enable_all(adapter); =20 - adapter->aq_required |=3D IAVF_FLAG_AQ_ENABLE_QUEUES; if (CLIENT_ENABLED(adapter)) adapter->flags |=3D IAVF_FLAG_CLIENT_NEEDS_OPEN; - mod_delayed_work(adapter->wq, &adapter->watchdog_task, 0); + iavf_schedule_aq_request(adapter, IAVF_FLAG_AQ_ENABLE_QUEUES); } =20 /** @@ -1439,8 +1437,7 @@ void iavf_down(struct iavf_adapter *adapter) adapter->aq_required |=3D IAVF_FLAG_AQ_DEL_ADV_RSS_CFG; } =20 - adapter->aq_required |=3D IAVF_FLAG_AQ_DISABLE_QUEUES; - mod_delayed_work(adapter->wq, &adapter->watchdog_task, 0); + iavf_schedule_aq_request(adapter, IAVF_FLAG_AQ_DISABLE_QUEUES); } =20 /** @@ -2340,10 +2337,8 @@ iavf_set_vlan_offload_features(struct iavf_adapter *= adapter, } } =20 - if (aq_required) { - adapter->aq_required |=3D aq_required; - mod_delayed_work(adapter->wq, &adapter->watchdog_task, 0); - } + if (aq_required) + iavf_schedule_aq_request(adapter, aq_required); } =20 /** --=20 2.42.0