From patchwork Tue Feb 4 11:50:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Larysa Zaremba X-Patchwork-Id: 13959029 X-Patchwork-Delegate: kuba@kernel.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7869D210F5A; Tue, 4 Feb 2025 12:05:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738670751; cv=none; b=o/lOc0pzhEV/iYZqIIqQy0QrNEGnk3lCi5ulv+30dVSJjBuNHEe8r7EjDDAD67uK6dhsPfKlZBbkqfT6nmjFRgLnWoZ9261Of1jNhtsIAJAUdNlgzxdxzifKyo0OqoGPfqpdnp4LhvwztpLrOEsxoKcaZFdvSnAthbTP8h2opd8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738670751; c=relaxed/simple; bh=M2eCGgxLh5c6cE335IWn+xf91G0/3FE3wsl1N+36ZVc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nqtYTHDDFzSCnd2AdtKXpEpYbyhPo+JNfJANphXberxVV4aXvFqMywkD6yxIsEBpMttKWqHw+RjyZDEdvKI8NXWj7G+baLyKYRsQSdC9k/ceuYnjOPDbGS5StsXLrBMfrfqVwE15azF2gqaQ0Fn5uoWb+VMAeNzeWjKOkXBpgME= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=Zn2/5zhN; arc=none smtp.client-ip=192.198.163.18 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="Zn2/5zhN" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1738670749; x=1770206749; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=M2eCGgxLh5c6cE335IWn+xf91G0/3FE3wsl1N+36ZVc=; b=Zn2/5zhNRulESdCSWLPxa16skCArJOGlUXA+r00aBRx1QpZ1wZaLiLHB mSeOgwFyp+BqGNZGEajI6IbQ1Q76LoWxLsG7+6EGCl0OM0NObY4qDXPTl L0vhcMMyW9dl1lfPwXh+Dd8dWckva4krA9s7e4GXUH7nVIcMH2N41NVYB smaGdSM7BOuDtRFKUFfu3zRAzZOU2/wkzPEqhGcTP+yydexV9W4xOTf62 NKwEmjTmyrcN08Eqm8LTzy/FXl+IkwjknRbRZbzi2jJBSfPO8lDBLFggo e7GhORXFGx8pCOasQ57XEmCPDK4/p0tQ5qbmRM+W3g6IM+LOTIdcOIXLw Q==; X-CSE-ConnectionGUID: 4OG9wb0YTmekxAMJ+nDkVQ== X-CSE-MsgGUID: dNF4pN4iTlSaB0gHqY8OVg== X-IronPort-AV: E=McAfee;i="6700,10204,11335"; a="38424800" X-IronPort-AV: E=Sophos;i="6.13,258,1732608000"; d="scan'208";a="38424800" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Feb 2025 04:05:49 -0800 X-CSE-ConnectionGUID: y/ziNlRhRFW6OLQaIDoGBw== X-CSE-MsgGUID: +NvJNivaQvuK8yuad4IN2w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,224,1728975600"; d="scan'208";a="147783219" Received: from irvmail002.ir.intel.com ([10.43.11.120]) by orviesa001.jf.intel.com with ESMTP; 04 Feb 2025 04:05:45 -0800 Received: from lincoln.igk.intel.com (lincoln.igk.intel.com [10.102.21.235]) by irvmail002.ir.intel.com (Postfix) with ESMTP id 8D37A32CA9; Tue, 4 Feb 2025 12:05:44 +0000 (GMT) From: Larysa Zaremba To: Tony Nguyen , intel-wired-lan@lists.osuosl.org Cc: Larysa Zaremba , Przemek Kitszel , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Michal Swiatkowski , Mateusz Pacuszka Subject: [PATCH iwl-next v2 1/6] ice: fix check for existing switch rule Date: Tue, 4 Feb 2025 12:50:51 +0100 Message-ID: <20250204115111.1652453-2-larysa.zaremba@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250204115111.1652453-1-larysa.zaremba@intel.com> References: <20250204115111.1652453-1-larysa.zaremba@intel.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org From: Mateusz Pacuszka In case the rule already exists and another VSI wants to subscribe to it new VSI list is being created and both VSIs are moved to it. Currently, the check for already existing VSI with the same rule is done based on fdw_id.hw_vsi_id, which applies only to LOOKUP_RX flag. Change it to vsi_handle. This is software VSI ID, but it can be applied here, because vsi_map itself is also based on it. Additionally change return status in case the VSI already exists in the VSI map to "Already exists". Such case should be handled by the caller. Signed-off-by: Mateusz Pacuszka Reviewed-by: Przemek Kitszel Reviewed-by: Michal Swiatkowski Signed-off-by: Larysa Zaremba --- drivers/net/ethernet/intel/ice/ice_switch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/intel/ice/ice_switch.c b/drivers/net/ethernet/intel/ice/ice_switch.c index 4a91e0aaf0a5..9d9a7edd3618 100644 --- a/drivers/net/ethernet/intel/ice/ice_switch.c +++ b/drivers/net/ethernet/intel/ice/ice_switch.c @@ -3146,7 +3146,7 @@ ice_add_update_vsi_list(struct ice_hw *hw, u16 vsi_handle_arr[2]; /* A rule already exists with the new VSI being added */ - if (cur_fltr->fwd_id.hw_vsi_id == new_fltr->fwd_id.hw_vsi_id) + if (cur_fltr->vsi_handle == new_fltr->vsi_handle) return -EEXIST; vsi_handle_arr[0] = cur_fltr->vsi_handle; @@ -5978,7 +5978,7 @@ ice_adv_add_update_vsi_list(struct ice_hw *hw, /* A rule already exists with the new VSI being added */ if (test_bit(vsi_handle, m_entry->vsi_list_info->vsi_map)) - return 0; + return -EEXIST; /* Update the previously created VSI list set with * the new VSI ID passed in