From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 77480A0518; Fri, 19 Jun 2020 16:33:43 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 80DD51BEC7; Fri, 19 Jun 2020 16:33:42 +0200 (CEST) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id BD6961BEC4 for ; Fri, 19 Jun 2020 16:33:40 +0200 (CEST) IronPort-SDR: exxsgupDv5U9L5/RPwx3IPvGJPB/rIVq9TjQ9XJuPe07GyepOSkV6OfJWHtQqhY71teFiJs+SY xxbyyl7gX2/w== X-IronPort-AV: E=McAfee;i="6000,8403,9656"; a="142045272" X-IronPort-AV: E=Sophos;i="5.75,255,1589266800"; d="scan'208";a="142045272" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jun 2020 07:33:39 -0700 IronPort-SDR: JICkPbQ6TVuCujI0rx1QWZQiaci4bzVE8MciMglXSF/0i3OKh5nyFNLdyqkcGVjSo+8XydpMvH VMntJE7BKynw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,255,1589266800"; d="scan'208";a="263890422" Received: from fyigit-mobl.ger.corp.intel.com (HELO [10.213.243.128]) ([10.213.243.128]) by orsmga007.jf.intel.com with ESMTP; 19 Jun 2020 07:33:37 -0700 To: Qi Zhang , qiming.yang@intel.com Cc: dev@dpdk.org, xiaolong.ye@intel.com, Wei Zhao , Paul M Stillwell Jr References: <20200611084330.18301-1-qi.z.zhang@intel.com> <20200611084330.18301-8-qi.z.zhang@intel.com> From: Ferruh Yigit Autocrypt: addr=ferruh.yigit@intel.com; prefer-encrypt=mutual; keydata= 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 dYuOYKR9nbPv+2zK9pwwQ2NXbUBystaGyQ== Message-ID: Date: Fri, 19 Jun 2020 15:33:36 +0100 MIME-Version: 1.0 In-Reply-To: <20200611084330.18301-8-qi.z.zhang@intel.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Subject: Re: [dpdk-dev] [PATCH 07/10] net/ice/base: get tunnel type for recipe X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" On 6/11/2020 9:43 AM, Qi Zhang wrote: > This patch add support to get tunnel type of recipe > after get recipe from fw. This will fix the issue in > function ice_find_recp() for tunnel type comparing. > > Signed-off-by: Wei Zhao > Signed-off-by: Paul M Stillwell Jr > Signed-off-by: Qi Zhang <...> > /** > + * ice_get_tun_type_for_recipe - get tunnel type for the recipe > + * @rid: recipe ID that we are populating > + */ > +static enum ice_sw_tunnel_type ice_get_tun_type_for_recipe(u8 rid) > +{ > + u8 vxlan_profile[12] = {10, 11, 12, 16, 17, 18, 22, 23, 24, 25, 26, 27}; > + u8 gre_profile[12] = {13, 14, 15, 19, 20, 21, 28, 29, 30, 31, 32, 33}; > + u8 pppoe_profile[7] = {34, 35, 36, 37, 38, 39, 40}; > + u8 non_tun_profile[6] = {4, 5, 6, 7, 8, 9}; > + enum ice_sw_tunnel_type tun_type; > + u16 i, j, profile_num = 0; > + bool non_tun_valid = false; > + bool pppoe_valid = false; > + bool vxlan_valid = false; > + bool gre_valid = false; > + bool gtp_valid = false; > + bool flag_valid = false; > + > + for (j = 0; j < ICE_MAX_NUM_PROFILES; j++) { > + if (!ice_is_bit_set(recipe_to_profile[rid], j)) > + continue; > + else > + profile_num++; > + > + for (i = 0; i < 12; i++) { > + if (gre_profile[i] == j) > + gre_valid = true; > + } > + > + for (i = 0; i < 12; i++) { > + if (vxlan_profile[i] == j) > + vxlan_valid = true; > + } > + > + for (i = 0; i < 7; i++) { > + if (pppoe_profile[i] == j) > + pppoe_valid = true; > + } > + > + for (i = 0; i < 6; i++) { > + if (non_tun_profile[i] == j) > + non_tun_valid = true; > + } > + > + if (j >= ICE_PROFID_IPV4_GTPC_TEID && > + j <= ICE_PROFID_IPV6_GTPU_IPV6_OTHER) > + gtp_valid = true; > + > + if (j >= ICE_PROFID_IPV4_ESP && > + j <= ICE_PROFID_IPV6_PFCP_SESSION) > + flag_valid = true; > + } > + > + if (!non_tun_valid && vxlan_valid) > + tun_type = ICE_SW_TUN_VXLAN; > + else if (!non_tun_valid && gre_valid) > + tun_type = ICE_SW_TUN_NVGRE; > + else if (!non_tun_valid && pppoe_valid) > + tun_type = ICE_SW_TUN_PPPOE; > + else if (!non_tun_valid && gtp_valid) > + tun_type = ICE_SW_TUN_GTP; > + else if ((non_tun_valid && vxlan_valid) || > + (non_tun_valid && gre_valid) || > + (non_tun_valid && gtp_valid) || > + (non_tun_valid && pppoe_valid)) > + tun_type = ICE_SW_TUN_AND_NON_TUN; > + else if ((non_tun_valid && !vxlan_valid) || > + (non_tun_valid && !gre_valid) || > + (non_tun_valid && !gtp_valid) || > + (non_tun_valid && !pppoe_valid)) > + tun_type = ICE_NON_TUN; > + > + if (profile_num > 1 && tun_type == ICE_SW_TUN_PPPOE) { This is giving 'tun_type' may be used uninitialized warning [1], fixing it setting a default value [2] while merging. [1] .../dpdk/drivers/net/ice/base/ice_switch.c: In function ‘ice_find_recp’: .../dpdk/drivers/net/ice/base/ice_switch.c:1100:22: error: ‘tun_type’ may be used uninitialized in this function [-Werror=maybe-uninitialized] 1100 | if (profile_num > 1 && tun_type == ICE_SW_TUN_PPPOE) { | ~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ .../dpdk/drivers/net/ice/base/ice_switch.c:1037:26: note: ‘tun_type’ was declared here 1037 | enum ice_sw_tunnel_type tun_type; | ^~~~~~~~ [2] - enum ice_sw_tunnel_type tun_type; + enum ice_sw_tunnel_type tun_type = ICE_NON_TUN;