perf/core: Fix perf_sample_regs_user() mm check
Sasha Levin
maintainerPATCH 1/6 perf/core: Fix perf_sample_regs_user() mm check
From: Peter Zijlstra <[email protected]>
[ Upstream commit 085ebfe937d7a7a5df1729f35a12d6d655fea68c ]
perf_sample_regs_user() uses 'current->mm' to test for the presence of userspace, but this is insufficient, consider use_mm().
A better test is: '!(current->flags & PF_KTHREAD)', exec() clears PF_KTHREAD after it sets the new ->mm but before it drops to userspace for the first time.
Possibly obsoletes: bf05fc25f268 ("powerpc/perf: Fix oops when kthread execs user process")
--- kernel/events/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/events/core.c +1 -1
@@ -5078,7 +5078,7 @@ static void perf_sample_regs_user(struct perf_regs *regs_user,if (user_mode (regs)) { regs_user->abi =perf_reg_abi (current); regs_user->regs = regs; - }else if (current->mm) { + }else if (!(current->flags &PF_KTHREAD )) {perf_get_regs_user (regs_user, regs, regs_user_copy); }else { regs_user->abi =PERF_SAMPLE_REGS_ABI_NONE ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 2/6 ARM: omap2: remove incorrect __init annotation
From: Arnd Bergmann <[email protected]>
[ Upstream commit 27e23d8975270df6999f8b5b3156fc0c04927451 ]
omap3xxx_prm_enable_io_wakeup() is marked __init, but its caller is not, so we get a warning with clang-8:
WARNING: vmlinux.o(.text+0x343c8): Section mismatch in reference from the function omap3xxx_prm_late_init() to the function .init.text:omap3xxx_prm_enable_io_wakeup() The function omap3xxx_prm_late_init() references
the function __init omap3xxx_prm_enable_io_wakeup().
This is often because omap3xxx_prm_late_init lacks a __init
annotation or the annotation of omap3xxx_prm_enable_io_wakeup is wrong.
When building with gcc, omap3xxx_prm_enable_io_wakeup() is always inlined, so we never noticed in the past.
--- arch/arm/mach-omap2/prm3xxx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-omap2/prm3xxx.c +1 -1
@@ -430,7 +430,7 @@ static void omap3_prm_reconfigure_io_chain(void)* registers, and omap3xxx_prm_reconfigure_io_chain() must be called. * No return value. */ -static void __init omap3xxx_prm_enable_io_wakeup (void ) +static void omap3xxx_prm_enable_io_wakeup (void ) {if (prm_features &PRM_HAS_IO_WAKEUP ) omap2_prm_set_mod_reg_bits(OMAP3430_EN_IO_MASK, WKUP_MOD,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 3/6 be2net: fix link failure after ethtool offline test
In reply to Sasha LevinFrom: Petr Oros <[email protected]>
[ Upstream commit 2e5db6eb3c23e5dc8171eb8f6af7a97ef9fcf3a9 ]
Certain cards in conjunction with certain switches need a little more time for link setup that results in ethtool link test failure after offline test. Patch adds a loop that waits for a link setup finish.
Changes in v2:
- added fixes header
--- .../net/ethernet/emulex/benet/be_ethtool.c | 28 +++++++++++++++---- 1 file changed, 22 insertions(+), 6 deletions(-)
drivers/net/ethernet/emulex/benet/be_ethtool.c +22 -6
@@ -868,7 +868,7 @@ static void be_self_test(struct net_device *netdev, struct ethtool_test *test, u64 *data) {struct be_adapter *adapter =netdev_priv (netdev); -int status; +int status, cnt;u8 link_status =0 ;if (adapter->function_caps &BE_FUNCTION_CAPS_SUPER_NIC ) {
@@ -879,6 +879,9 @@ static void be_self_test(struct net_device *netdev, struct ethtool_test *test,memset (data,0 ,sizeof (u64) *ETHTOOL_TESTS_NUM ); +/* check link status before offline tests */ + link_status =netif_carrier_ok (netdev); +if (test->flags Ð_TEST_FL_OFFLINE ) {if (be_loopback_test (adapter,BE_MAC_LOOPBACK , &data[0 ]) !=0 ) test->flags |=ETH_TEST_FL_FAILED ;
@@ -899,13 +902,26 @@ static void be_self_test(struct net_device *netdev, struct ethtool_test *test, test->flags |=ETH_TEST_FL_FAILED ; } - status =be_cmd_link_status_query (adapter,NULL , &link_status,0 ); -if (status) { - test->flags |=ETH_TEST_FL_FAILED ; - data[4 ] =-1 ; - }else if (!link_status) { +/* link status was down prior to test */ +if (!link_status) { test->flags |=ETH_TEST_FL_FAILED ; data[4 ] =1 ; +return ; + } + +for (cnt =10 ; cnt; cnt--) { + status =be_cmd_link_status_query (adapter,NULL , &link_status, +0 ); +if (status) { + test->flags |=ETH_TEST_FL_FAILED ; + data[4 ] =-1 ; +break ; + } + +if (link_status) +break ; + +msleep_interruptible (500 ); } }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 4/6 ppp: mppe: Add softdep to arc4
In reply to Sasha LevinFrom: Takashi Iwai <[email protected]>
[ Upstream commit aad1dcc4f011ea409850e040363dff1e59aa4175 ]
The arc4 crypto is mandatory at ppp_mppe probe time, so let's put a softdep line, so that the corresponding module gets prepared gracefully. Without this, a simple inclusion to initrd via dracut failed due to the missing dependency, for example.
--- drivers/net/ppp/ppp_mppe.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ppp/ppp_mppe.c +1 -0
@@ -62,6 +62,7 @@ MODULE_AUTHOR("Frank Cusack <[email protected]>");MODULE_DESCRIPTION ("Point-to-Point Protocol Microsoft Point-to-Point Encryption support" );MODULE_LICENSE ("Dual BSD/GPL" );MODULE_ALIAS ("ppp-compress-" __stringify(CI_MPPE )); +MODULE_SOFTDEP ("pre: arc4" );MODULE_VERSION ("1.0.2" ); static unsigned int
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 5/6 sis900: fix TX completion
In reply to Sasha LevinFrom: Sergej Benilov <[email protected]>
[ Upstream commit 8ac8a01092b2added0749ef937037bf1912e13e3 ]
Since commit 605ad7f184b60cfaacbc038aa6c55ee68dee3c89 "tcp: refine TSO autosizing", outbound throughput is dramatically reduced for some connections, as sis900 is doing TX completion within idle states only.
Make TX completion happen after every transmitted packet.
Test:
netperf
before patch:
Quoted 1 line
netperf -H remote -l -2000000 -- -s 1000000
MIGRATED TCP STREAM TEST from 0.0.0.0 () port 0 AF_INET to 95.223.112.76 () port 0 AF_INET : demo
Recv Send Send Socket Socket Message Elapsed Size Size Size Time Throughput bytes bytes bytes secs. 10^6bits/sec
87380 327680 327680 253.44 0.06
after patch:
Quoted 1 line
netperf -H remote -l -10000000 -- -s 1000000
MIGRATED TCP STREAM TEST from 0.0.0.0 () port 0 AF_INET to 95.223.112.76 () port 0 AF_INET : demo
Recv Send Send Socket Socket Message Elapsed Size Size Size Time Throughput bytes bytes bytes secs. 10^6bits/sec
87380 327680 327680 5.38 14.89
Thx to Dave Miller and Eric Dumazet for helpful hints
--- drivers/net/ethernet/sis/sis900.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/net/ethernet/sis/sis900.c +8 -8
@@ -1058,7 +1058,7 @@ sis900_open(struct net_device *net_dev)sis900_set_mode (sis_priv,HW_SPEED_10_MBPS ,FDX_CAPABLE_HALF_SELECTED );/* Enable all known interrupts by setting the interrupt mask. */ -sw32 (imr, RxSOVR | RxORN | RxERR | RxOK | TxURN | TxERR | TxIDLE); +sw32 (imr, RxSOVR | RxORN | RxERR | RxOK | TxURN | TxERR | TxIDLE | TxDESC);sw32 (cr, RxENA |sr32 (cr));sw32 (ier,IE );
@@ -1581,7 +1581,7 @@ static void sis900_tx_timeout(struct net_device *net_dev)sw32 (txdp, sis_priv->tx_ring_dma);/* Enable all known interrupts by setting the interrupt mask. */ -sw32 (imr, RxSOVR | RxORN | RxERR | RxOK | TxURN | TxERR | TxIDLE); +sw32 (imr, RxSOVR | RxORN | RxERR | RxOK | TxURN | TxERR | TxIDLE | TxDESC); }/**
@@ -1621,7 +1621,7 @@ sis900_start_xmit(struct sk_buff *skb, struct net_device *net_dev)spin_unlock_irqrestore (&sis_priv->lock, flags);return NETDEV_TX_OK ; } - sis_priv->tx_ring[entry].cmdsts = (OWN | skb->len); + sis_priv->tx_ring[entry].cmdsts = (OWN |INTR | skb->len);sw32 (cr, TxENA |sr32 (cr)); sis_priv->cur_tx ++;
@@ -1677,7 +1677,7 @@ static irqreturn_t sis900_interrupt(int irq, void *dev_instance) do { status = sr32(isr); - if ((status & (HIBERR|TxURN|TxERR|TxIDLE|RxORN|RxERR|RxOK)) == 0) + if ((status & (HIBERR|TxURN|TxERR|TxIDLE|TxDESC|RxORN|RxERR|RxOK)) == 0) /* nothing intresting happened */ break; handled = 1;
@@ -1687,7 +1687,7 @@ static irqreturn_t sis900_interrupt(int irq, void *dev_instance)/* Rx interrupt */ sis900_rx (net_dev); -if (status & (TxURN | TxERR | TxIDLE)) +if (status & (TxURN | TxERR | TxIDLE | TxDESC))/* Tx interrupt */ sis900_finish_xmit (net_dev);
@@ -1899,8 +1899,8 @@ static void sis900_finish_xmit (struct net_device *net_dev)if (tx_status &OWN ) {/* The packet is not transmitted yet (owned by hardware) ! -* Note: the interrupt is generated only when Tx Machine -* is idle, so this is an almost impossible case */ +* Note: this is an almost impossible condition +* in case of TxDESC ('descriptor interrupt') */ break ; }
@@ -2476,7 +2476,7 @@ static int sis900_resume(struct pci_dev *pci_dev)sis900_set_mode (sis_priv,HW_SPEED_10_MBPS ,FDX_CAPABLE_HALF_SELECTED );/* Enable all known interrupts by setting the interrupt mask. */ -sw32 (imr, RxSOVR | RxORN | RxERR | RxOK | TxURN | TxERR | TxIDLE); +sw32 (imr, RxSOVR | RxORN | RxERR | RxOK | TxURN | TxERR | TxIDLE | TxDESC);sw32 (cr, RxENA |sr32 (cr));sw32 (ier,IE );
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 6/6 dm verity: use message limit for data block corruption message
In reply to Sasha LevinFrom: Milan Broz <[email protected]>
[ Upstream commit 2eba4e640b2c4161e31ae20090a53ee02a518657 ]
DM verity should also use DMERR_LIMIT to limit repeat data block corruption messages.
--- drivers/md/dm-verity.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/md/dm-verity.c +2 -2
@@ -221,8 +221,8 @@ static int verity_handle_err(struct dm_verity *v, enum verity_block_type type,BUG (); } -DMERR ("%s: %s block %llu is corrupted" , v->data_dev->name, type_str, - block); +DMERR_LIMIT ("%s: %s block %llu is corrupted" , v->data_dev->name, + type_str, block);if (v->corrupted_errs ==DM_VERITY_MAX_CORRUPTED_ERRS )DMERR ("%s: reached maximum errors" , v->data_dev->name);
Signature · 1 line
2.20.1