diff for duplicates of <1469655487.2232.49.camel@intel.com> diff --git a/a/1.txt b/N1/1.txt index 6035257..38df2fb 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -10,30 +10,23 @@ On Tue, 2016-07-26 at 11:14 +0200, Eric Dumazet wrote: > +++ b/drivers/net/ethernet/intel/e1000/e1000_main.c > @@ -5257,9 +5257,13 @@ static void e1000_netpoll(struct net_device > *netdev) -> ?{ -> ????????struct e1000_adapter *adapter = netdev_priv(netdev); -> ? -> -???????disable_irq(adapter->pdev->irq); -> -???????e1000_intr(adapter->pdev->irq, netdev); -> -???????enable_irq(adapter->pdev->irq); -> +???????if (napi_schedule_prep(&adapter->napi)) { -> +???????????????adapter->total_tx_bytes = 0; -> +???????????????adapter->total_tx_packets = 0; -> +???????????????adapter->total_rx_bytes = 0; -> +???????????????adapter->total_rx_packets = 0; -> +???????????????__napi_schedule(&adapter->napi); -> +???????} -> ?} -> ?#endif -> ? +> { +> struct e1000_adapter *adapter = netdev_priv(netdev); +> +> - disable_irq(adapter->pdev->irq); +> - e1000_intr(adapter->pdev->irq, netdev); +> - enable_irq(adapter->pdev->irq); +> + if (napi_schedule_prep(&adapter->napi)) { +> + adapter->total_tx_bytes = 0; +> + adapter->total_tx_packets = 0; +> + adapter->total_rx_bytes = 0; +> + adapter->total_rx_packets = 0; +> + __napi_schedule(&adapter->napi); +> + } +> } +> #endif +> -Since this fixes the issue?Fengguang saw, will you be submitting a formal +Since this fixes the issue Fengguang saw, will you be submitting a formal patch Eric? (please) I can get this queued up for Dave's net tree as soon as I receive the formal patch. --------------- 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/20160727/292e5060/attachment.asc> diff --git a/N1/2.bin b/N1/2.bin new file mode 100644 index 0000000..91d6a1d --- /dev/null +++ b/N1/2.bin @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQIcBAABCgAGBQJXmSnAAAoJEOVv75VaS+3OpkQP/15jUfxKcOg2Ljwvo3zn7tLY +KqS0n6rk+t2sVnwpZEwF44czkUPIZDbd7534ftSlLe7bfDhQQv/ioz8fA5I1UuHs +QRlkKnlOtyRJalkR+LubEjX7QCyuZd1HfxzXkGLP3gbX1hX0wXHzDNuNMiLV1D9t +LPq83g5mIsPWis00hhN+XPghWJKW1RaWl5qfOHCyGGuQtVT15bbulGzLNwqeTSdH +38O64zmRbkLpEdf1JoR60eypEBWv3acZNkv1I2Epna0YAKyVPyVMnNJRb/1UBEqW +DZ69HvNwVjnA/L27EjWP5Sqac0s5qe1h0hq+dFh4h99e0skc4e5VqRtRyFu7bNKM +hLF50IYvf8MUZ886KHN3YB2XgJbzXbg1mR69TPFej7/rpwUuW5vP66GAj54Eci8m +XgI1lXwDn7wEy+aED0oDZ3LEEKpl6L3xdT5anY7LwbTpXJrjJN9J+zeqyiuFlqyn +XLkNdOREY2Ff7+bCEcaPob7aebazHgtnFpwwyDNURgLNLbo5DoYKonQTXHBZVfOu +Xw0KPfMLivFyrOI8+b8xiU6OD+fGEHtK4c7QOXhhAKCnhSg1fRrRS2mu9P/kgCoe +bSdOY7H7Iyz+W1B7+dLNCfhHW5IRhHWyIaf93BEHwTcZ4x9MtCbc3JLeiMmb4E+/ +30lAvRN4ZQDmd+zdkXAE +=eqm2 +-----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 1823fb6..506466d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,10 +1,17 @@ "ref\020160726035003.GA15095@wfg-t540p.sh.intel.com\0" "ref\01469524492.17736.3.camel@edumazet-glaptop3.roam.corp.google.com\0" "From\0Jeff Kirsher <jeffrey.t.kirsher@intel.com>\0" - "Subject\0[Intel-wired-lan] [e1000_netpoll] BUG: sleeping function called from invalid context at kernel/irq/manage.c:110\0" + "Subject\0Re: [e1000_netpoll] BUG: sleeping function called from invalid context at kernel/irq/manage.c:110\0" "Date\0Wed, 27 Jul 2016 14:38:07 -0700\0" - "To\0intel-wired-lan@osuosl.org\0" - "\00:1\0" + "To\0Eric Dumazet <eric.dumazet@gmail.com>" + " Fengguang Wu <fengguang.wu@intel.com>\0" + "Cc\0LKML <linux-kernel@vger.kernel.org>" + netdev@vger.kernel.org + Satyam Sharma <satyam@infradead.org> + Thomas Gleixner <tglx@linutronix.de> + intel-wired-lan@lists.osuosl.org + " Ye Xiaolong <xiaolong.ye@intel.com>\0" + "\01:1\0" "b\0" "On Tue, 2016-07-26 at 11:14 +0200, Eric Dumazet wrote:\n" "> Could you try this ?\n" @@ -18,32 +25,46 @@ "> +++ b/drivers/net/ethernet/intel/e1000/e1000_main.c\n" "> @@ -5257,9 +5257,13 @@ static void e1000_netpoll(struct net_device\n" "> *netdev)\n" - "> ?{\n" - "> ????????struct e1000_adapter *adapter = netdev_priv(netdev);\n" - "> ?\n" - "> -???????disable_irq(adapter->pdev->irq);\n" - "> -???????e1000_intr(adapter->pdev->irq, netdev);\n" - "> -???????enable_irq(adapter->pdev->irq);\n" - "> +???????if (napi_schedule_prep(&adapter->napi)) {\n" - "> +???????????????adapter->total_tx_bytes = 0;\n" - "> +???????????????adapter->total_tx_packets = 0;\n" - "> +???????????????adapter->total_rx_bytes = 0;\n" - "> +???????????????adapter->total_rx_packets = 0;\n" - "> +???????????????__napi_schedule(&adapter->napi);\n" - "> +???????}\n" - "> ?}\n" - "> ?#endif\n" - "> ?\n" + "> \302\240{\n" + "> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240struct e1000_adapter *adapter = netdev_priv(netdev);\n" + "> \302\240\n" + "> -\302\240\302\240\302\240\302\240\302\240\302\240\302\240disable_irq(adapter->pdev->irq);\n" + "> -\302\240\302\240\302\240\302\240\302\240\302\240\302\240e1000_intr(adapter->pdev->irq, netdev);\n" + "> -\302\240\302\240\302\240\302\240\302\240\302\240\302\240enable_irq(adapter->pdev->irq);\n" + "> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240if (napi_schedule_prep(&adapter->napi)) {\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\240adapter->total_tx_bytes = 0;\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\240adapter->total_tx_packets = 0;\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\240adapter->total_rx_bytes = 0;\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\240adapter->total_rx_packets = 0;\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__napi_schedule(&adapter->napi);\n" + "> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240}\n" + "> \302\240}\n" + "> \302\240#endif\n" + "> \302\240\n" "\n" - "Since this fixes the issue?Fengguang saw, will you be submitting a formal\n" + "Since this fixes the issue\302\240Fengguang saw, will you be submitting a formal\n" "patch Eric? (please) I can get this queued up for Dave's net tree as soon\n" - "as I receive the formal patch.\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/20160727/292e5060/attachment.asc> + as I receive the formal patch. + "\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" + "iQIcBAABCgAGBQJXmSnAAAoJEOVv75VaS+3OpkQP/15jUfxKcOg2Ljwvo3zn7tLY\n" + "KqS0n6rk+t2sVnwpZEwF44czkUPIZDbd7534ftSlLe7bfDhQQv/ioz8fA5I1UuHs\n" + "QRlkKnlOtyRJalkR+LubEjX7QCyuZd1HfxzXkGLP3gbX1hX0wXHzDNuNMiLV1D9t\n" + "LPq83g5mIsPWis00hhN+XPghWJKW1RaWl5qfOHCyGGuQtVT15bbulGzLNwqeTSdH\n" + "38O64zmRbkLpEdf1JoR60eypEBWv3acZNkv1I2Epna0YAKyVPyVMnNJRb/1UBEqW\n" + "DZ69HvNwVjnA/L27EjWP5Sqac0s5qe1h0hq+dFh4h99e0skc4e5VqRtRyFu7bNKM\n" + "hLF50IYvf8MUZ886KHN3YB2XgJbzXbg1mR69TPFej7/rpwUuW5vP66GAj54Eci8m\n" + "XgI1lXwDn7wEy+aED0oDZ3LEEKpl6L3xdT5anY7LwbTpXJrjJN9J+zeqyiuFlqyn\n" + "XLkNdOREY2Ff7+bCEcaPob7aebazHgtnFpwwyDNURgLNLbo5DoYKonQTXHBZVfOu\n" + "Xw0KPfMLivFyrOI8+b8xiU6OD+fGEHtK4c7QOXhhAKCnhSg1fRrRS2mu9P/kgCoe\n" + "bSdOY7H7Iyz+W1B7+dLNCfhHW5IRhHWyIaf93BEHwTcZ4x9MtCbc3JLeiMmb4E+/\n" + "30lAvRN4ZQDmd+zdkXAE\n" + "=eqm2\n" + "-----END PGP SIGNATURE-----\n" -4a00b51909800b2d394456344c31ae69ca8c4551f393426fb639edac06fdf3d7 +e7b331f61d190032744b38ee65062e99fcfe1e8aadd9098c09cf924e16173ea5
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.