Re: [PATCH net 0/3][pull request] Intel Wired LAN Driver Updates 2023-12-12 (iavf)

[Tony Nguyen <anthony.l.nguyen@intel.com>]

On 12/12/2023 12:36 PM, Tony Nguyen wrote:
> This series contains updates to iavf driver only.
> 
> Piotr reworks Flow Director states to deal with issues in restoring
> filters.
> 
> Slawomir fixes shutdown processing as it was missing needed calls.
> 
> The following are changes since commit 810c38a369a0a0ce625b5c12169abce1dd9ccd53:
>    net/rose: Fix Use-After-Free in rose_ioctl
> and are available in the git repository at:
>    git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue 40GbE

I forgot to add that this will conflict when merging with net-next.

Resolution:

@@@ -1435,11 -1436,16 +1435,15 @@@ static int iavf_add_fdir_ethtool(struc
         spin_lock_bh(&adapter->fdir_fltr_lock);
         iavf_fdir_list_add_fltr(adapter, fltr);
         adapter->fdir_active_fltr++;
-       fltr->state = IAVF_FDIR_FLTR_ADD_REQUEST;
-       spin_unlock_bh(&adapter->fdir_fltr_lock);
  -      if (adapter->link_up) {
  +
-       iavf_schedule_aq_request(adapter, IAVF_FLAG_AQ_ADD_FDIR_FILTER);
++      if (adapter->link_up)
+               fltr->state = IAVF_FDIR_FLTR_ADD_REQUEST;
  -              adapter->aq_required |= IAVF_FLAG_AQ_ADD_FDIR_FILTER;
  -      } else {
++      else
+               fltr->state = IAVF_FDIR_FLTR_INACTIVE;
  -      }
+       spin_unlock_bh(&adapter->fdir_fltr_lock);

+       if (adapter->link_up)
  -              mod_delayed_work(adapter->wq, &adapter->watchdog_task, 0);
++              iavf_schedule_aq_request(adapter, 
IAVF_FLAG_AQ_ADD_FDIR_FILTER);
   ret:
         if (err && fltr)
                 kfree(fltr);
@@@ -1469,6 -1475,12 +1473,11 @@@ static int iavf_del_fdir_ethtool(struc
         if (fltr) {
                 if (fltr->state == IAVF_FDIR_FLTR_ACTIVE) {
                         fltr->state = IAVF_FDIR_FLTR_DEL_REQUEST;
  -                      adapter->aq_required |= 
IAVF_FLAG_AQ_DEL_FDIR_FILTER;
+               } else if (fltr->state == IAVF_FDIR_FLTR_INACTIVE) {
+                       list_del(&fltr->list);
+                       kfree(fltr);
+                       adapter->fdir_active_fltr--;
+                       fltr = NULL;
                 } else {
                         err = -EBUSY;