diff for duplicates of <1496867699.2192.2.camel@intel.com> diff --git a/a/1.txt b/N1/1.txt index 7bcb61c..52a3c22 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -2,50 +2,50 @@ On Wed, 2017-06-07 at 16:55 -0300, Mauro Rodrigues wrote: > On Wed, May 17, 2017 at 10:49:11PM -0700, Jeff Kirsher wrote: > > 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? > > @@ -59,10 +59,3 @@ On Wed, 2017-06-07 at 16:55 -0300, Mauro Rodrigues wrote: > Mauro The patch that fixed this issue is already in David Miller's net-next tree. --------------- next part -------------- -A non-text attachment was scrubbed... -Name: signature.asc -Type: application/pgp-signature -Size: 819 bytes -Desc: This is a digitally signed message part -URL: <http://lists.osuosl.org/pipermail/intel-wired-lan/attachments/20170607/9080abaf/attachment.asc> diff --git a/N1/2.bin b/N1/2.bin new file mode 100644 index 0000000..52b57f8 --- /dev/null +++ b/N1/2.bin @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQIcBAABCgAGBQJZOGNzAAoJEOVv75VaS+3O4RoQAKbkVORTPpov/Iow4A/uXKKI +cjYmOPsMxHKLwslr8obGUnTZe7GlEZUDy6XJRwOLa0jMHm1aGteZPvrk3yKNUsN/ +5qF5IT8YU2295llo2UqyGcN2PhHWD/M/aKWE5Gunn6nToVOwufa/HBuC0t0H9Kha +ZXmWqH9mx6wtG8OyOKG+N8QZjhEl53y0c5T5JO0ZNFn1LEhVW9YaYWb/3vK0JADa +mypJTzo9lmKzoNEUF4GUleSlJ6CESRmC9BJLCCYegWoEsQu+Yw6AzN5JrOfkBHXy +xvPFgLZznXiKujF9H96a6wbdqa9C1+E4x8nosrNV68I9c2asJB7qz4kkQ2BkX5kT +fDy1QvehWA+k1zHrSckUdbiyQY3jT5U+zW8TUB6VPOwCwidATCRK+zydHTFcXjhM +dePKQTejwyy++RXMHTBbOF8xPoR3iA/fp13I6QNMCa/zWrTqrD6IDFpQasYuSKTr +ydS/9GI6FSfYKn/6BY9ZbjFyIxRoICPfg38dl6xaf2C6JC+Q9IgzlYCiJu06/ko9 +NJngfTVffkMvTXugbmomu6AG+wgQ23MADFYtsD4ROA3BkjLyF5fFWIr6GO9S4V3R +nTEEEg0Y0IRMbaUw0AKXyyaMa1Yfy44udPFSZSQRot+UcmU7u1E5bQLrk+ZzHHVm +fwUWIbkUKHf4v+6U6osU +=2TIT +-----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 a705f6a..00ea573 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,59 +2,63 @@ "ref\01495086551.46489.1.camel@intel.com\0" "ref\020170607195526.GA26867@korriban\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, 07 Jun 2017 13:34:59 -0700\0" - "To\0intel-wired-lan@osuosl.org\0" - "\00:1\0" + "To\0Mauro Rodrigues <maurosr@linux.vnet.ibm.com>\0" + "Cc\0Gustavo A. R. Silva <garsilva@embeddedor.com>" + intel-wired-lan@lists.osuosl.org + netdev@vger.kernel.org + " linux-kernel@vger.kernel.org\0" + "\01:1\0" "b\0" "On Wed, 2017-06-07 at 16:55 -0300, Mauro Rodrigues wrote:\n" "> On Wed, May 17, 2017 at 10:49:11PM -0700, Jeff Kirsher wrote:\n" "> > 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" @@ -67,13 +71,27 @@ "> \n" "> Mauro\n" "\n" - "The patch that fixed this issue is already in David Miller's net-next tree.\n" - "-------------- next part --------------\n" - "A non-text attachment was scrubbed...\n" - "Name: signature.asc\n" - "Type: application/pgp-signature\n" - "Size: 819 bytes\n" - "Desc: This is a digitally signed message part\n" - URL: <http://lists.osuosl.org/pipermail/intel-wired-lan/attachments/20170607/9080abaf/attachment.asc> + The patch that fixed this issue is already in David Miller's net-next tree. + "\01:2\0" + "fn\0signature.asc\0" + "d\0This is a digitally signed message part\0" + "b\0" + "-----BEGIN PGP SIGNATURE-----\n" + "Version: GnuPG v2\n" + "\n" + "iQIcBAABCgAGBQJZOGNzAAoJEOVv75VaS+3O4RoQAKbkVORTPpov/Iow4A/uXKKI\n" + "cjYmOPsMxHKLwslr8obGUnTZe7GlEZUDy6XJRwOLa0jMHm1aGteZPvrk3yKNUsN/\n" + "5qF5IT8YU2295llo2UqyGcN2PhHWD/M/aKWE5Gunn6nToVOwufa/HBuC0t0H9Kha\n" + "ZXmWqH9mx6wtG8OyOKG+N8QZjhEl53y0c5T5JO0ZNFn1LEhVW9YaYWb/3vK0JADa\n" + "mypJTzo9lmKzoNEUF4GUleSlJ6CESRmC9BJLCCYegWoEsQu+Yw6AzN5JrOfkBHXy\n" + "xvPFgLZznXiKujF9H96a6wbdqa9C1+E4x8nosrNV68I9c2asJB7qz4kkQ2BkX5kT\n" + "fDy1QvehWA+k1zHrSckUdbiyQY3jT5U+zW8TUB6VPOwCwidATCRK+zydHTFcXjhM\n" + "dePKQTejwyy++RXMHTBbOF8xPoR3iA/fp13I6QNMCa/zWrTqrD6IDFpQasYuSKTr\n" + "ydS/9GI6FSfYKn/6BY9ZbjFyIxRoICPfg38dl6xaf2C6JC+Q9IgzlYCiJu06/ko9\n" + "NJngfTVffkMvTXugbmomu6AG+wgQ23MADFYtsD4ROA3BkjLyF5fFWIr6GO9S4V3R\n" + "nTEEEg0Y0IRMbaUw0AKXyyaMa1Yfy44udPFSZSQRot+UcmU7u1E5bQLrk+ZzHHVm\n" + "fwUWIbkUKHf4v+6U6osU\n" + "=2TIT\n" + "-----END PGP SIGNATURE-----\n" -d5a597b42d4caca0114e1c4258597552d0c3bb9a96416fef41c34861aee92224 +62a938950b95a375b4444ab999b37e00782c8b25eed9fa82d77ef909492d7434
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.