From mboxrd@z Thu Jan 1 00:00:00 1970 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 EB1F8C433EF for ; Thu, 5 May 2022 20:07:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1385590AbiEEUKs (ORCPT ); Thu, 5 May 2022 16:10:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58656 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1385584AbiEEUKm (ORCPT ); Thu, 5 May 2022 16:10:42 -0400 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 49C115E754 for ; Thu, 5 May 2022 13:07:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1651781221; x=1683317221; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=06VojNUxsxphBpokOIVux4qISl5acOPlWUA3PeCKBdY=; b=VlEocwFZ9XbMlpOK/OX3DxlKyNyRCOwYBCO9M+KLufGPUK6Nse92cepn UCf4BOjS/iWksqnyI6yAl5sw33C9oCzhDxNjm541DnTToG3FbteJUY4PO bHUlCxoaUVwfiAJTuq2K4gFE7m0wxz5ABbbkdW3RuoeOpboH+fYXg1y7r BhLH93Go9SWL4buprKg9fd7jP1uldFALXlhehQcwGZ1kQjXtUW3Fk1poC w9O2JQIT2dyamdnmilvgT8l+ic31wHABV6xmoqXXWun9nCBpCmaMwUgT1 QUrlJIrAIy/TkP1xPQBWK4shuUmmq0/WyENAta84QrzvaBQD/Xm3NFerb g==; X-IronPort-AV: E=McAfee;i="6400,9594,10338"; a="248772036" X-IronPort-AV: E=Sophos;i="5.91,203,1647327600"; d="scan'208";a="248772036" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 May 2022 13:07:00 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.91,203,1647327600"; d="scan'208";a="735111704" Received: from anguy11-desk2.jf.intel.com ([10.166.244.147]) by orsmga005.jf.intel.com with ESMTP; 05 May 2022 13:06:59 -0700 From: Tony Nguyen To: davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, edumazet@google.com Cc: Wojciech Drewek , netdev@vger.kernel.org, anthony.l.nguyen@intel.com, Marcin Szycik , Maciej Fijalkowski , Sandeep Penigalapati Subject: [PATCH net-next v2 03/10] ice: return ENOSPC when exceeding ICE_MAX_CHAIN_WORDS Date: Thu, 5 May 2022 13:03:52 -0700 Message-Id: <20220505200359.3080110-4-anthony.l.nguyen@intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220505200359.3080110-1-anthony.l.nguyen@intel.com> References: <20220505200359.3080110-1-anthony.l.nguyen@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Wojciech Drewek When number of words exceeds ICE_MAX_CHAIN_WORDS, -ENOSPC should be returned not -EINVAL. Do not overwrite this error code in ice_add_tc_flower_adv_fltr. Signed-off-by: Wojciech Drewek Suggested-by: Marcin Szycik Acked-by: Maciej Fijalkowski Tested-by: Sandeep Penigalapati Signed-off-by: Tony Nguyen --- drivers/net/ethernet/intel/ice/ice_switch.c | 5 ++++- drivers/net/ethernet/intel/ice/ice_tc_lib.c | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/intel/ice/ice_switch.c b/drivers/net/ethernet/intel/ice/ice_switch.c index 496250f9f8fc..9f0a4dfb4818 100644 --- a/drivers/net/ethernet/intel/ice/ice_switch.c +++ b/drivers/net/ethernet/intel/ice/ice_switch.c @@ -5992,9 +5992,12 @@ ice_add_adv_rule(struct ice_hw *hw, struct ice_adv_lkup_elem *lkups, word_cnt++; } - if (!word_cnt || word_cnt > ICE_MAX_CHAIN_WORDS) + if (!word_cnt) return -EINVAL; + if (word_cnt > ICE_MAX_CHAIN_WORDS) + return -ENOSPC; + /* locate a dummy packet */ profile = ice_find_dummy_packet(lkups, lkups_cnt, rinfo->tun_type); diff --git a/drivers/net/ethernet/intel/ice/ice_tc_lib.c b/drivers/net/ethernet/intel/ice/ice_tc_lib.c index 3acd9f921c44..0a0c55fb8699 100644 --- a/drivers/net/ethernet/intel/ice/ice_tc_lib.c +++ b/drivers/net/ethernet/intel/ice/ice_tc_lib.c @@ -622,7 +622,6 @@ ice_add_tc_flower_adv_fltr(struct ice_vsi *vsi, } else if (ret) { NL_SET_ERR_MSG_MOD(tc_fltr->extack, "Unable to add filter due to error"); - ret = -EIO; goto exit; } -- 2.35.1