diff for duplicates of <1495086551.46489.1.camel@intel.com> diff --git a/a/1.txt b/N1/1.txt index 2ebc931..8238143 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,58 +1,51 @@ On Wed, 2017-05-17 at 15:48 -0500, Gustavo A. R. Silva wrote: > While looking into Coverity ID 1408956 I ran into the following -> piece?? +> piece > of code at drivers/net/ethernet/intel/i40e/i40e_main.c:8807: > -> 8807??????? if (pf->hw.mac.type == I40E_MAC_X722) { -> 8808??????????????? pf->flags |= I40E_FLAG_RSS_AQ_CAPABLE -> 8809???????????????????????????? | I40E_FLAG_128_QP_RSS_CAPABLE -> 8810???????????????????????????? | I40E_FLAG_HW_ATR_EVICT_CAPABLE -> 8811???????????????????????????? | I40E_FLAG_OUTER_UDP_CSUM_CAPABLE -> 8812???????????????????????????? | I40E_FLAG_WB_ON_ITR_CAPABLE -> 8813???????????????????????????? | +> 8807 if (pf->hw.mac.type == I40E_MAC_X722) { +> 8808 pf->flags |= I40E_FLAG_RSS_AQ_CAPABLE +> 8809 | I40E_FLAG_128_QP_RSS_CAPABLE +> 8810 | I40E_FLAG_HW_ATR_EVICT_CAPABLE +> 8811 | I40E_FLAG_OUTER_UDP_CSUM_CAPABLE +> 8812 | I40E_FLAG_WB_ON_ITR_CAPABLE +> 8813 | > I40E_FLAG_MULTIPLE_TCP_UDP_RSS_PCTYPE -> 8814???????????????????????????? | I40E_FLAG_NO_PCI_LINK_CHECK -> 8815???????????????????????????? | I40E_FLAG_USE_SET_LLDP_MIB -> 8816???????????????????????????? | I40E_FLAG_GENEVE_OFFLOAD_CAPABLE -> 8817???????????????????????????? | I40E_FLAG_PTP_L4_CAPABLE -> 8818???????????????????????????? | I40E_FLAG_WOL_MC_MAGIC_PKT_WAKE; -> 8819??????? } else if ((pf->hw.aq.api_maj_ver > 1) || -> 8820?????????????????? ((pf->hw.aq.api_maj_ver == 1) && -> 8821??????????????????? (pf->hw.aq.api_min_ver > 4))) { -> 8822??????????????? /* Supported in FW API version higher than 1.4 */ -> 8823??????????????? pf->flags |= I40E_FLAG_GENEVE_OFFLOAD_CAPABLE; -> 8824??????????????? pf->flags = I40E_FLAG_HW_ATR_EVICT_CAPABLE; -> 8825??????? } else { -> 8826??????????????? pf->flags = I40E_FLAG_HW_ATR_EVICT_CAPABLE; -> 8827??????? } +> 8814 | I40E_FLAG_NO_PCI_LINK_CHECK +> 8815 | I40E_FLAG_USE_SET_LLDP_MIB +> 8816 | I40E_FLAG_GENEVE_OFFLOAD_CAPABLE +> 8817 | I40E_FLAG_PTP_L4_CAPABLE +> 8818 | I40E_FLAG_WOL_MC_MAGIC_PKT_WAKE; +> 8819 } else if ((pf->hw.aq.api_maj_ver > 1) || +> 8820 ((pf->hw.aq.api_maj_ver == 1) && +> 8821 (pf->hw.aq.api_min_ver > 4))) { +> 8822 /* Supported in FW API version higher than 1.4 */ +> 8823 pf->flags |= I40E_FLAG_GENEVE_OFFLOAD_CAPABLE; +> 8824 pf->flags = I40E_FLAG_HW_ATR_EVICT_CAPABLE; +> 8825 } else { +> 8826 pf->flags = I40E_FLAG_HW_ATR_EVICT_CAPABLE; +> 8827 } > > The issue here is that the assignment at line 8823 is overwritten -> by?? +> by > the code at line 8824. > -> I'm suspicious that line 8824 should be remove and a patch like the?? +> I'm suspicious that line 8824 should be remove and a patch like the > following can be applied: > > index d5c9c9e..48ffa73 100644 > --- a/drivers/net/ethernet/intel/i40e/i40e_main.c > +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c > @@ -8821,7 +8821,6 @@ static int i40e_sw_init(struct i40e_pf *pf) -> ???????????????????? (pf->hw.aq.api_min_ver > 4))) { -> ???????????????? /* Supported in FW API version higher than 1.4 */ -> ???????????????? pf->flags |= I40E_FLAG_GENEVE_OFFLOAD_CAPABLE; -> -?????????????? pf->flags = I40E_FLAG_HW_ATR_EVICT_CAPABLE; -> ???????? } else { -> ???????????????? pf->flags = I40E_FLAG_HW_ATR_EVICT_CAPABLE; -> ???????? } +> (pf->hw.aq.api_min_ver > 4))) { +> /* Supported in FW API version higher than 1.4 */ +> pf->flags |= I40E_FLAG_GENEVE_OFFLOAD_CAPABLE; +> - pf->flags = I40E_FLAG_HW_ATR_EVICT_CAPABLE; +> } else { +> pf->flags = I40E_FLAG_HW_ATR_EVICT_CAPABLE; +> } > > What do you think? This issue is already fixed in my dev-queue branch on my next-queue tree. --------------- next part -------------- -A non-text attachment was scrubbed... -Name: signature.asc -Type: application/pgp-signature -Size: 833 bytes -Desc: This is a digitally signed message part -URL: <http://lists.osuosl.org/pipermail/intel-wired-lan/attachments/20170517/9e80a5f1/attachment.asc> diff --git a/N1/2.bin b/N1/2.bin new file mode 100644 index 0000000..31bbda5 --- /dev/null +++ b/N1/2.bin @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEiTyZWz+nnTrOJ1LZ5W/vlVpL7c4FAlkdNdcACgkQ5W/vlVpL +7c4tmg//fxyJW3LMS3JUVt/JllIyOR3O/gjF4CDGRTEpguLKQTJV9IQnuI0Rxhzz +b7r6DwRbsWXpXITfQehhUMoliKVvGon+19Kpp0Ku3JLkt8/YSFJc3IMONR3bZUXH +uZEin/BxXOhxcFUg17LyRabkbEbf2tJ8LmdBeoCUWflYHV5aLu0lSAT0EhfIih5N +aHZb2XH3otbHJ5NjKng1/T/E6RjJG5Z0sD3DZL2xvYx54GXJ4gcsDxUa4ID+Ja/e +7DtIqZAo9wj87n/yk//TwoxTo8VBpPx5zUcTnDSqwp9o+hf4bfuJCfoRoVX9pI3C +4VR1RsNtZnCiajUtdvtKP+ZttsdRCTeNTtOZ+mFDbOHkpEyAyN9ROrdJFOctdkbl +zHylrKZjnkdYLmcpr9w8mD4S3cL/3SGa3gDO0dGgIjYXPXQDXR+j5YjU9mVE7pA5 +EbNoLG1uhyfm4EKvcIb54koS+AuBomUPN2CYWxGcYbwRqSPAd8UXf646XoeA3ANR +w/A/vOljIR6BnNBq5iOZvX8tXiTqwj96gcOzVMr79rbUVjLeuSAqmlxzkfe9ZEuO +5x25bHVAiu/WkGuPjo76Py9/qv1OSXWR6Q94ZuCnfbZPwqXwAEu6uLQRGuGOUqgO +zomdwSOEDE4nQIR2RrB6CI0KWeDd6xzZxNpeOGkd1flVeg+yaiI= +=r/f+ +-----END PGP SIGNATURE----- diff --git a/N1/2.hdr b/N1/2.hdr new file mode 100644 index 0000000..da6d245 --- /dev/null +++ b/N1/2.hdr @@ -0,0 +1,3 @@ +Content-Type: application/pgp-signature; name="signature.asc" +Content-Description: This is a digitally signed message part +Content-Transfer-Encoding: 7bit diff --git a/a/content_digest b/N1/content_digest index 7b8b6ad..a219959 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,67 +1,83 @@ "ref\020170517154858.Horde.xMvsIEhHNSGu52mfyp7HA3R@gator4166.hostgator.com\0" "From\0Jeff Kirsher <jeffrey.t.kirsher@intel.com>\0" - "Subject\0[Intel-wired-lan] [net-intel-i40e] question about assignment overwrite\0" + "Subject\0Re: [net-intel-i40e] question about assignment overwrite\0" "Date\0Wed, 17 May 2017 22:49:11 -0700\0" - "To\0intel-wired-lan@osuosl.org\0" - "\00:1\0" + "To\0Gustavo A. R. Silva <garsilva@embeddedor.com>\0" + "Cc\0intel-wired-lan@lists.osuosl.org" + netdev@vger.kernel.org + " linux-kernel@vger.kernel.org\0" + "\01:1\0" "b\0" "On Wed, 2017-05-17 at 15:48 -0500, Gustavo A. R. Silva wrote:\n" "> While looking into Coverity ID 1408956 I ran into the following\n" - "> piece??\n" + "> piece\302\240\302\240\n" "> of code at drivers/net/ethernet/intel/i40e/i40e_main.c:8807:\n" "> \n" - "> 8807??????? if (pf->hw.mac.type == I40E_MAC_X722) {\n" - "> 8808??????????????? pf->flags |= I40E_FLAG_RSS_AQ_CAPABLE\n" - "> 8809???????????????????????????? | I40E_FLAG_128_QP_RSS_CAPABLE\n" - "> 8810???????????????????????????? | I40E_FLAG_HW_ATR_EVICT_CAPABLE\n" - "> 8811???????????????????????????? | I40E_FLAG_OUTER_UDP_CSUM_CAPABLE\n" - "> 8812???????????????????????????? | I40E_FLAG_WB_ON_ITR_CAPABLE\n" - "> 8813???????????????????????????? |\n" + "> 8807\302\240\302\240\302\240\302\240\302\240\302\240\302\240 if (pf->hw.mac.type == I40E_MAC_X722) {\n" + "> 8808\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 pf->flags |= I40E_FLAG_RSS_AQ_CAPABLE\n" + "> 8809\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 | I40E_FLAG_128_QP_RSS_CAPABLE\n" + "> 8810\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 | I40E_FLAG_HW_ATR_EVICT_CAPABLE\n" + "> 8811\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 | I40E_FLAG_OUTER_UDP_CSUM_CAPABLE\n" + "> 8812\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 | I40E_FLAG_WB_ON_ITR_CAPABLE\n" + "> 8813\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 |\n" "> I40E_FLAG_MULTIPLE_TCP_UDP_RSS_PCTYPE\n" - "> 8814???????????????????????????? | I40E_FLAG_NO_PCI_LINK_CHECK\n" - "> 8815???????????????????????????? | I40E_FLAG_USE_SET_LLDP_MIB\n" - "> 8816???????????????????????????? | I40E_FLAG_GENEVE_OFFLOAD_CAPABLE\n" - "> 8817???????????????????????????? | I40E_FLAG_PTP_L4_CAPABLE\n" - "> 8818???????????????????????????? | I40E_FLAG_WOL_MC_MAGIC_PKT_WAKE;\n" - "> 8819??????? } else if ((pf->hw.aq.api_maj_ver > 1) ||\n" - "> 8820?????????????????? ((pf->hw.aq.api_maj_ver == 1) &&\n" - "> 8821??????????????????? (pf->hw.aq.api_min_ver > 4))) {\n" - "> 8822??????????????? /* Supported in FW API version higher than 1.4 */\n" - "> 8823??????????????? pf->flags |= I40E_FLAG_GENEVE_OFFLOAD_CAPABLE;\n" - "> 8824??????????????? pf->flags = I40E_FLAG_HW_ATR_EVICT_CAPABLE;\n" - "> 8825??????? } else {\n" - "> 8826??????????????? pf->flags = I40E_FLAG_HW_ATR_EVICT_CAPABLE;\n" - "> 8827??????? }\n" + "> 8814\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 | I40E_FLAG_NO_PCI_LINK_CHECK\n" + "> 8815\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 | I40E_FLAG_USE_SET_LLDP_MIB\n" + "> 8816\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 | I40E_FLAG_GENEVE_OFFLOAD_CAPABLE\n" + "> 8817\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 | I40E_FLAG_PTP_L4_CAPABLE\n" + "> 8818\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 | I40E_FLAG_WOL_MC_MAGIC_PKT_WAKE;\n" + "> 8819\302\240\302\240\302\240\302\240\302\240\302\240\302\240 } else if ((pf->hw.aq.api_maj_ver > 1) ||\n" + "> 8820\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 ((pf->hw.aq.api_maj_ver == 1) &&\n" + "> 8821\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 (pf->hw.aq.api_min_ver > 4))) {\n" + "> 8822\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 /* Supported in FW API version higher than 1.4 */\n" + "> 8823\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 pf->flags |= I40E_FLAG_GENEVE_OFFLOAD_CAPABLE;\n" + "> 8824\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 pf->flags = I40E_FLAG_HW_ATR_EVICT_CAPABLE;\n" + "> 8825\302\240\302\240\302\240\302\240\302\240\302\240\302\240 } else {\n" + "> 8826\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 pf->flags = I40E_FLAG_HW_ATR_EVICT_CAPABLE;\n" + "> 8827\302\240\302\240\302\240\302\240\302\240\302\240\302\240 }\n" "> \n" "> The issue here is that the assignment at line 8823 is overwritten\n" - "> by??\n" + "> by\302\240\302\240\n" "> the code at line 8824.\n" "> \n" - "> I'm suspicious that line 8824 should be remove and a patch like the??\n" + "> I'm suspicious that line 8824 should be remove and a patch like the\302\240\302\240\n" "> following can be applied:\n" "> \n" "> index d5c9c9e..48ffa73 100644\n" "> --- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n" "> +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n" "> @@ -8821,7 +8821,6 @@ static int i40e_sw_init(struct i40e_pf *pf)\n" - "> ???????????????????? (pf->hw.aq.api_min_ver > 4))) {\n" - "> ???????????????? /* Supported in FW API version higher than 1.4 */\n" - "> ???????????????? pf->flags |= I40E_FLAG_GENEVE_OFFLOAD_CAPABLE;\n" - "> -?????????????? pf->flags = I40E_FLAG_HW_ATR_EVICT_CAPABLE;\n" - "> ???????? } else {\n" - "> ???????????????? pf->flags = I40E_FLAG_HW_ATR_EVICT_CAPABLE;\n" - "> ???????? }\n" + "> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 (pf->hw.aq.api_min_ver > 4))) {\n" + "> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 /* Supported in FW API version higher than 1.4 */\n" + "> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 pf->flags |= I40E_FLAG_GENEVE_OFFLOAD_CAPABLE;\n" + "> -\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 pf->flags = I40E_FLAG_HW_ATR_EVICT_CAPABLE;\n" + "> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 } else {\n" + "> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 pf->flags = I40E_FLAG_HW_ATR_EVICT_CAPABLE;\n" + "> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 }\n" "> \n" "> What do you think?\n" "\n" "This issue is already fixed in my dev-queue branch on my next-queue\n" - "tree.\n" - "-------------- next part --------------\n" - "A non-text attachment was scrubbed...\n" - "Name: signature.asc\n" - "Type: application/pgp-signature\n" - "Size: 833 bytes\n" - "Desc: This is a digitally signed message part\n" - URL: <http://lists.osuosl.org/pipermail/intel-wired-lan/attachments/20170517/9e80a5f1/attachment.asc> + tree. + "\01:2\0" + "fn\0signature.asc\0" + "d\0This is a digitally signed message part\0" + "b\0" + "-----BEGIN PGP SIGNATURE-----\n" + "\n" + "iQIzBAABCAAdFiEEiTyZWz+nnTrOJ1LZ5W/vlVpL7c4FAlkdNdcACgkQ5W/vlVpL\n" + "7c4tmg//fxyJW3LMS3JUVt/JllIyOR3O/gjF4CDGRTEpguLKQTJV9IQnuI0Rxhzz\n" + "b7r6DwRbsWXpXITfQehhUMoliKVvGon+19Kpp0Ku3JLkt8/YSFJc3IMONR3bZUXH\n" + "uZEin/BxXOhxcFUg17LyRabkbEbf2tJ8LmdBeoCUWflYHV5aLu0lSAT0EhfIih5N\n" + "aHZb2XH3otbHJ5NjKng1/T/E6RjJG5Z0sD3DZL2xvYx54GXJ4gcsDxUa4ID+Ja/e\n" + "7DtIqZAo9wj87n/yk//TwoxTo8VBpPx5zUcTnDSqwp9o+hf4bfuJCfoRoVX9pI3C\n" + "4VR1RsNtZnCiajUtdvtKP+ZttsdRCTeNTtOZ+mFDbOHkpEyAyN9ROrdJFOctdkbl\n" + "zHylrKZjnkdYLmcpr9w8mD4S3cL/3SGa3gDO0dGgIjYXPXQDXR+j5YjU9mVE7pA5\n" + "EbNoLG1uhyfm4EKvcIb54koS+AuBomUPN2CYWxGcYbwRqSPAd8UXf646XoeA3ANR\n" + "w/A/vOljIR6BnNBq5iOZvX8tXiTqwj96gcOzVMr79rbUVjLeuSAqmlxzkfe9ZEuO\n" + "5x25bHVAiu/WkGuPjo76Py9/qv1OSXWR6Q94ZuCnfbZPwqXwAEu6uLQRGuGOUqgO\n" + "zomdwSOEDE4nQIR2RrB6CI0KWeDd6xzZxNpeOGkd1flVeg+yaiI=\n" + "=r/f+\n" + "-----END PGP SIGNATURE-----\n" -ad6e64d34274ac78076eea74c04a833a1d3eca0cf89383f3c2a6c2d1309f8bca +a405247b79ce3416765821c2c99529751210b6af2c6ebfe5b15570caec1908f9
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.