ALSA: isight: fix leak of reference to firewire unit in error path of .probe callback
Subsystems (41)
Sasha Levin
maintainerPATCH 1/237 ALSA: isight: fix leak of reference to firewire unit in error path of .probe callback
From: Takashi Sakamoto <[email protected]>
[ Upstream commit 51e68fb0929c29e47e9074ca3e99ffd6021a1c5a ]
In some error paths, reference count of firewire unit is not decreased. This commit fixes the bug.
--- sound/firewire/isight.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
sound/firewire/isight.c +5 -5
@@ -640,7 +640,7 @@ static int isight_probe(struct fw_unit *unit,if (!isight->audio_base) {dev_err (&unit->device,"audio unit base not found\n" ); err = -ENXIO ; - goto err_unit; + goto error; }fw_iso_resources_init (&isight->resources, unit);
@@ -669,12 +669,12 @@ static int isight_probe(struct fw_unit *unit,dev_set_drvdata (&unit->device, isight);return 0 ; - -err_unit: -fw_unit_put (isight->unit); -mutex_destroy (&isight->mutex); error:snd_card_free (card); + +mutex_destroy (&isight->mutex); +fw_unit_put (isight->unit); +return err; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 2/237 crypto: testmgr - fix sizeof() on COMP_BUF_SIZE
From: Michael Schupikov <[email protected]>
[ Upstream commit 22a8118d329334833cd30f2ceb36d28e8cae8a4f ]
After allocation, output and decomp_output both point to memory chunks of size COMP_BUF_SIZE. Then, only the first bytes are zeroed out using sizeof(COMP_BUF_SIZE) as parameter to memset(), because sizeof(COMP_BUF_SIZE) provides the size of the constant and not the size of allocated memory.
Instead, the whole allocated memory is meant to be zeroed out. Use COMP_BUF_SIZE as parameter to memset() directly in order to accomplish this.
--- crypto/testmgr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
crypto/testmgr.c +3 -3
@@ -1400,8 +1400,8 @@ static int test_comp(struct crypto_comp *tfm,int ilen;unsigned int dlen =COMP_BUF_SIZE ; -memset (output,0 ,sizeof (COMP_BUF_SIZE )); -memset (decomp_output,0 ,sizeof (COMP_BUF_SIZE )); +memset (output,0 ,COMP_BUF_SIZE ); +memset (decomp_output,0 ,COMP_BUF_SIZE ); ilen = ctemplate[i].inlen; ret = crypto_comp_compress(tfm, ctemplate[i].input,
@@ -1445,7 +1445,7 @@ static int test_comp(struct crypto_comp *tfm,int ilen;unsigned int dlen =COMP_BUF_SIZE ; -memset (decomp_output,0 ,sizeof (COMP_BUF_SIZE )); +memset (decomp_output,0 ,COMP_BUF_SIZE ); ilen = dtemplate[i].inlen; ret = crypto_comp_decompress(tfm, dtemplate[i].input,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 3/237 printk: lock/unlock console only for new logbuf entries
In reply to Sasha LevinFrom: Sergey Senozhatsky <[email protected]>
[ Upstream commit 3ac37a93fa9217e576bebfd4ba3e80edaaeb2289 ]
Prior to commit 5c2992ee7fd8a29 ("printk: remove console flushing special cases for partial buffered lines") we would do console_cont_flush() for each pr_cont() to print cont fragments, so console_unlock() would actually print data:
pr_cont(); console_lock(); console_unlock() console_cont_flush(); // print cont fragment ... pr_cont(); console_lock(); console_unlock() console_cont_flush(); // print cont fragment
We don't do console_cont_flush() anymore, so when we do pr_cont() console_unlock() does nothing (unless we flushed the cont buffer):
pr_cont(); console_lock(); console_unlock(); // noop ... pr_cont(); console_lock(); console_unlock(); // noop ... pr_cont(); cont_flush(); console_lock(); console_unlock(); // print data
We also wakeup klogd purposelessly for pr_cont() output - un-flushed cont buffer is not stored in log_buf; there is nothing to pull.
Thus we can console_lock()/console_unlock()/wake_up_klogd() only when we know that we log_store()-ed a message and there is something to print to the consoles/syslog.
To: Steven Rostedt <[email protected]>
--- kernel/printk/printk.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
kernel/printk/printk.c +7 -3
@@ -1894,8 +1894,9 @@ asmlinkage int vprintk_emit(int facility, int level, const char *fmt, va_list args) { int printed_len; -bool in_sched = false; +bool in_sched = false, pending_output;unsigned long flags; +u64 curr_log_seq;if (level ==LOGLEVEL_SCHED ) { level =LOGLEVEL_DEFAULT ;
@@ -1907,11 +1908,13 @@ asmlinkage int vprintk_emit(int facility, int level,/* This stops the holder of console_sem just where we want him */ logbuf_lock_irqsave (flags); + curr_log_seq = log_next_seq; printed_len =vprintk_store (facility, level, dict, dictlen, fmt, args); + pending_output = (curr_log_seq != log_next_seq);logbuf_unlock_irqrestore (flags);/* If called from the scheduler, we can not call up(). */ -if (!in_sched) { +if (!in_sched && pending_output) {/* * Disable preemption to avoid being preempted while holding * console_sem which would prevent anyone from printing to
@@ -1928,7 +1931,8 @@ asmlinkage int vprintk_emit(int facility, int level,preempt_enable (); } -wake_up_klogd (); +if (pending_output) +wake_up_klogd ();return printed_len; }EXPORT_SYMBOL (vprintk_emit);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 4/237 printk: fix integer overflow in setup_log_buf()
In reply to Sasha LevinFrom: Sergey Senozhatsky <[email protected]>
[ Upstream commit d2130e82e9454304e9b91ba9da551b5989af8c27 ]
The way we calculate logbuf free space percentage overflows signed integer:
int free;
free = __LOG_BUF_LEN - log_next_idx;
pr_info("early log buf free: %u(%u%%)\n",
free, (free * 100) / __LOG_BUF_LEN);We support LOG_BUF_LEN of up to 1<<25 bytes. Since setup_log_buf() is called during early init, logbuf is mostly empty, so
__LOG_BUF_LEN - log_next_idx
is close to 1<<25. Thus when we multiply it by 100, we overflow signed integer value range: 100 is 2^6 + 2^5 + 2^2.
Example, booting with LOG_BUF_LEN 1<<25 and log_buf_len=2G boot param:
[ 0.075317] log_buf_len: -2147483648 bytes [ 0.075319] early log buf free: 33549896(-28%)
Make "free" unsigned integer and use appropriate printk() specifier.
To: Steven Rostedt <[email protected]>
--- kernel/printk/printk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/printk/printk.c +1 -1
@@ -1098,7 +1098,7 @@ void __init setup_log_buf(int early) {unsigned long flags;char *new_log_buf; -int free; +unsigned int free;if (log_buf != __log_buf)return ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 5/237 pinctrl: madera: Fix uninitialized variable bug in madera_mux_set_mux
In reply to Sasha LevinFrom: "Gustavo A. R. Silva" <[email protected]>
[ Upstream commit 4fe81669df50889ff1072c030c59df5f1fa6534e ]
There is a potential execution path in which variable *ret* is checked in an IF statement, and then its value is used to report an error at line 659 without being properly initialized previously:
659 if (ret)
660 dev_err(priv->dev, "Failed to write to 0x%x (%d)\n", reg, ret);
Fix this by initializing variable *ret* to 0 in order to avoid unpredictable or unintended results.
Addresses-Coverity-ID: 1471969 ("Uninitialized scalar variable")
--- drivers/pinctrl/cirrus/pinctrl-madera-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pinctrl/cirrus/pinctrl-madera-core.c +1 -1
@@ -608,7 +608,7 @@ static int madera_mux_set_mux(struct pinctrl_dev *pctldev,unsigned int n_chip_groups = priv->chip->n_pin_groups;const char *func_name = madera_mux_funcs[selector].name;unsigned int reg; -int i, ret; +int i, ret =0 ; dev_dbg(priv->dev, "%s selecting %u (%s) for group %u (%s)\n", __func__, selector, func_name, group,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 6/237 PCI: cadence: Write MSI data with 32bits
In reply to Sasha LevinFrom: Alan Douglas <[email protected]>
[ Upstream commit e81e36a96bb56f243b5ac1d114c37c086761595b ]
According to the PCIe specification, although the MSI data is only 16bits, the upper 16bits should be written as 0. Use writel instead of writew when writing the MSI data to the host.
--- drivers/pci/controller/pcie-cadence-ep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/controller/pcie-cadence-ep.c +1 -1
@@ -355,7 +355,7 @@ static int cdns_pcie_ep_send_msi_irq(struct cdns_pcie_ep *ep, u8 fn, ep->irq_pci_addr = (pci_addr & ~pci_addr_mask); ep->irq_pci_fn = fn; } -writew (data, ep->irq_cpu_addr + (pci_addr & pci_addr_mask)); +writel (data, ep->irq_cpu_addr + (pci_addr & pci_addr_mask));return 0 ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 7/237 gfs2: Fix marking bitmaps non-full
In reply to Sasha LevinFrom: Andreas Gruenbacher <[email protected]>
[ Upstream commit ec23df2b0cf3e1620f5db77972b7fb735f267eff ]
Reservations in gfs can span multiple gfs2_bitmaps (but they won't span multiple resource groups). When removing a reservation, we want to clear the GBF_FULL flags of all involved gfs2_bitmaps, not just that of the first bitmap.
--- fs/gfs2/rgrp.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
fs/gfs2/rgrp.c +11 -2
@@ -642,7 +642,10 @@ static void __rs_deltree(struct gfs2_blkreserv *rs)RB_CLEAR_NODE (&rs->rs_node);if (rs->rs_free) { -struct gfs2_bitmap *bi =rbm_bi (&rs->rs_rbm); +u64 last_block =gfs2_rbm_to_block (&rs->rs_rbm) + + rs->rs_free -1 ; +struct gfs2_rbm last_rbm = { .rgd = rs->rs_rbm.rgd, }; +struct gfs2_bitmap *start, *last;/* return reserved blocks to the rgrp */ BUG_ON (rs->rs_rbm.rgd->rd_reserved < rs->rs_free);
@@ -653,7 +656,13 @@ static void __rs_deltree(struct gfs2_blkreserv *rs)it will force the number to be recalculated later. */ rgd->rd_extfail_pt += rs->rs_free; rs->rs_free =0 ; -clear_bit (GBF_FULL , &bi->bi_flags); +if (gfs2_rbm_from_block (&last_rbm, last_block)) +return ; + start =rbm_bi (&rs->rs_rbm); + last =rbm_bi (&last_rbm); +do +clear_bit (GBF_FULL , &start->bi_flags); +while (start++ != last); } }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 8/237 pty: fix compat ioctls
In reply to Sasha LevinFrom: Al Viro <[email protected]>
[ Upstream commit 50f45326afab723df529eca54095e2feac24da2d ]
pointer-taking ones need compat_ptr(); int-taking one doesn't.
--- drivers/tty/pty.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
drivers/tty/pty.c +12 -2
@@ -28,6 +28,7 @@#include <linux/mount.h> #include <linux/file.h> #include <linux/ioctl.h> +#include <linux/compat.h> #undef TTY_DEBUG_HANGUP#ifdef TTY_DEBUG_HANGUP
@@ -488,6 +489,7 @@ static int pty_bsd_ioctl(struct tty_struct *tty,return -ENOIOCTLCMD ; } +#ifdef CONFIG_COMPAT static long pty_bsd_compat_ioctl (struct tty_struct *tty,unsigned int cmd,unsigned long arg) {
@@ -495,8 +497,11 @@ static long pty_bsd_compat_ioctl(struct tty_struct *tty,* PTY ioctls don't require any special translation between 32-bit and * 64-bit userspace, they are already compatible. */ -return pty_bsd_ioctl (tty, cmd, arg); + return pty_bsd_ioctl(tty, cmd, (unsigned long)compat_ptr(arg)); } +#else +#define pty_bsd_compat_ioctl NULL +#endif static int legacy_count =CONFIG_LEGACY_PTY_COUNT ;/*
@@ -676,6 +681,7 @@ static int pty_unix98_ioctl(struct tty_struct *tty,return -ENOIOCTLCMD ; } +#ifdef CONFIG_COMPAT static long pty_unix98_compat_ioctl (struct tty_struct *tty,unsigned int cmd,unsigned long arg) {
@@ -683,8 +689,12 @@ static long pty_unix98_compat_ioctl(struct tty_struct *tty,* PTY ioctls don't require any special translation between 32-bit and * 64-bit userspace, they are already compatible. */ -return pty_unix98_ioctl (tty, cmd, arg); +return pty_unix98_ioctl (tty, cmd, + cmd == TIOCSIG ? arg : (unsigned long)compat_ptr(arg)); } +#else +#define pty_unix98_compat_ioctl NULL +#endif /** * ptm_unix98_lookup - find a pty master
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 9/237 synclink_gt(): fix compat_ioctl()
In reply to Sasha LevinFrom: Al Viro <[email protected]>
[ Upstream commit 27230e51349fde075598c1b59d15e1ff802f3f6e ]
compat_ptr() for pointer-taking ones...
--- drivers/tty/synclink_gt.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-)
drivers/tty/synclink_gt.c +4 -12
@@ -1186,14 +1186,13 @@ static long slgt_compat_ioctl(struct tty_struct *tty, unsigned int cmd, unsigned long arg) {struct slgt_info *info = tty->driver_data; -int rc = -ENOIOCTLCMD ; +int rc;if (sanity_check (info, tty->name,"compat_ioctl" ))return -ENODEV ;DBGINFO (("%s compat_ioctl() cmd=%08X\n" , info->device_name, cmd));switch (cmd) { -case MGSL_IOCSPARAMS32 : rc =set_params32 (info,compat_ptr (arg));break ;
@@ -1213,18 +1212,11 @@ static long slgt_compat_ioctl(struct tty_struct *tty,case MGSL_IOCWAITGPIO :case MGSL_IOCGXSYNC :case MGSL_IOCGXCTRL : -case MGSL_IOCSTXIDLE : -case MGSL_IOCTXENABLE : -case MGSL_IOCRXENABLE : -case MGSL_IOCTXABORT : -case TIOCMIWAIT : -case MGSL_IOCSIF : -case MGSL_IOCSXSYNC : -case MGSL_IOCSXCTRL : - rc =ioctl (tty, cmd, arg); + rc =ioctl (tty, cmd, (unsigned long )compat_ptr (arg));break ; +default : + rc =ioctl (tty, cmd, arg); } -DBGINFO (("%s compat_ioctl() cmd=%08X rc=%d\n" , info->device_name, cmd, rc));return rc; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 10/237 powerpc: Fix signedness bug in update_flash_db()
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit 014704e6f54189a203cc14c7c0bb411b940241bc ]
The "count < sizeof(struct os_area_db)" comparison is type promoted to size_t so negative values of "count" are treated as very high values and we accidentally return success instead of a negative error code.
This doesn't really change runtime much but it fixes a static checker warning.
--- arch/powerpc/platforms/ps3/os-area.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/platforms/ps3/os-area.c +1 -1
@@ -664,7 +664,7 @@ static int update_flash_db(void)db_set_64 (db, &os_area_db_id_rtc_diff, saved_params.rtc_diff); count =os_area_flash_write (db,sizeof (struct os_area_db ), pos); -if (count <sizeof (struct os_area_db )) { +if (count <0 || count <sizeof (struct os_area_db )) {pr_debug ("%s: os_area_flash_write failed %zd\n" , __func__, count); error = count <0 ? count : -EIO ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 11/237 powerpc/boot: Fix opal console in boot wrapper
In reply to Sasha LevinFrom: Joel Stanley <[email protected]>
[ Upstream commit 1a855eaccf353f7ed1d51a3d4b3af727ccbd81ca ]
As of commit 10c77dba40ff ("powerpc/boot: Fix build failure in 32-bit boot wrapper") the opal code is hidden behind CONFIG_PPC64_BOOT_WRAPPER, but the boot wrapper avoids include/linux, so it does not get the normal Kconfig flags.
We can drop the guard entirely as in commit f8e8e69cea49 ("powerpc/boot:
Only build OPAL code when necessary") the makefile only includes opal.c in the build if CONFIG_PPC64_BOOT_WRAPPER is set.
--- arch/powerpc/boot/opal.c | 8 -------- 1 file changed, 8 deletions(-)
arch/powerpc/boot/opal.c +0 -8
@@ -13,8 +13,6 @@#include <libfdt.h> #include "../include/asm/opal-api.h" -#ifdef CONFIG_PPC64_BOOT_WRAPPER -/* Global OPAL struct used by opal-call.S */ struct opal {u64 base;
@@ -101,9 +99,3 @@ int opal_console_init(void *devp, struct serial_console_data *scdp)return 0 ; } -#else -int opal_console_init (void *devp,struct serial_console_data *scdp) -{ -return -1 ; -} -#endif /* __powerpc64__ */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 12/237 powerpc/boot: Disable vector instructions
In reply to Sasha LevinFrom: Joel Stanley <[email protected]>
[ Upstream commit e8e132e6885962582784b6fa16a80d07ea739c0f ]
This will avoid auto-vectorisation when building with higher optimisation levels.
We don't know if the machine can support VSX and even if it's present it's probably not going to be enabled at this point in boot.
These flag were both added prior to GCC 4.6 which is the minimum compiler version supported by upstream, thanks to Segher for the details.
--- arch/powerpc/boot/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/powerpc/boot/Makefile +2 -2
@@ -32,8 +32,8 @@ else endif BOOTCFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ - -fno-strict-aliasing -Os -msoft-float -pipe \ - -fomit-frame-pointer -fno-builtin -fPIC -nostdinc \ + -fno-strict-aliasing -Os -msoft-float -mno-altivec -mno-vsx \ + -pipe -fomit-frame-pointer -fno-builtin -fPIC -nostdinc \ -D$(compress-y) ifdef CONFIG_PPC64_BOOT_WRAPPER
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 13/237 powerpc/eeh: Fix null deref for devices removed during EEH
In reply to Sasha LevinFrom: Sam Bobroff <[email protected]>
[ Upstream commit bcbe3730531239abd45ab6c6af4a18078b37dd47 ]
If a device is removed during EEH processing (either by a driver's handler or as part of recovery), it can lead to a null dereference in eeh_pe_report_edev().
To handle this, skip devices that have been removed.
--- arch/powerpc/kernel/eeh_driver.c | 4 ++++ 1 file changed, 4 insertions(+)
arch/powerpc/kernel/eeh_driver.c +4 -0
@@ -281,6 +281,10 @@ static void eeh_pe_report_edev(struct eeh_dev *edev, eeh_report_fn fn,struct pci_driver *driver;enum pci_ers_result new_result; +if (!edev->pdev) { +eeh_edev_info (edev,"no device" ); +return ; + }device_lock (&edev->pdev->dev);if (eeh_edev_actionable (edev)) { driver =eeh_pcid_get (edev->pdev);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 14/237 powerpc/eeh: Fix use of EEH_PE_KEEP on wrong field
In reply to Sasha LevinFrom: Sam Bobroff <[email protected]>
[ Upstream commit 473af09b56dc4be68e4af33220ceca6be67aa60d ]
eeh_add_to_parent_pe() sometimes removes the EEH_PE_KEEP flag, but it incorrectly removes it from pe->type, instead of pe->state.
However, rather than clearing it from the correct field, remove it. Inspection of the code shows that it can't ever have had any effect (even if it had been cleared from the correct field), because the field is never tested after it is cleared by the statement in question.
The clear statement was added by commit 807a827d4e74 ("powerpc/eeh:
Keep PE during hotplug"), but it didn't explain why it was necessary.
--- arch/powerpc/kernel/eeh_pe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/kernel/eeh_pe.c +1 -1
@@ -379,7 +379,7 @@ int eeh_add_to_parent_pe(struct eeh_dev *edev)while (parent) {if (!(parent->type &EEH_PE_INVALID ))break ; - parent->type &= ~(EEH_PE_INVALID |EEH_PE_KEEP ); + parent->type &= ~EEH_PE_INVALID ; parent = parent->parent; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 15/237 EDAC, thunderx: Fix memory leak in thunderx_l2c_threaded_isr()
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit d8c27ba86a2fd806d3957e5a9b30e66dfca2a61d ]
Fix memory leak in L2c threaded interrupt handler.
[ bp: Rewrite commit message. ]
--- drivers/edac/thunderx_edac.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/edac/thunderx_edac.c +2 -2
@@ -1884,7 +1884,7 @@ static irqreturn_t thunderx_l2c_threaded_isr(int irq, void *irq_id)default :dev_err (&l2c->pdev->dev,"Unsupported device: %04x\n" , l2c->pdev->device); -return IRQ_NONE ; + goto err_free; } while (CIRC_CNT(l2c->ring_head, l2c->ring_tail,
@@ -1906,7 +1906,7 @@ static irqreturn_t thunderx_l2c_threaded_isr(int irq, void *irq_id) l2c->ring_tail++; } -return IRQ_HANDLED ; + ret =IRQ_HANDLED ; err_free:kfree (other);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 16/237 mt76: do not store aggregation sequence number for null-data frames
In reply to Sasha LevinFrom: Felix Fietkau <[email protected]>
[ Upstream commit 5155938d8a0fe0e0251435cae02539e81fb8e407 ]
Fixes a rare corner case where a BlockAckReq might get the wrong sequence number.
--- drivers/net/wireless/mediatek/mt76/tx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/tx.c +2 -1
@@ -148,7 +148,8 @@ mt76_check_agg_ssn(struct mt76_txq *mtxq, struct sk_buff *skb) {struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data; -if (!ieee80211_is_data_qos (hdr->frame_control)) +if (!ieee80211_is_data_qos (hdr->frame_control) || + !ieee80211_is_data_present (hdr->frame_control))return ; mtxq->agg_ssn =le16_to_cpu (hdr->seq_ctrl) +0x10 ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 17/237 mt76x0: phy: fix restore phase in mt76x0_phy_recalibrate_after_assoc
In reply to Sasha LevinFrom: Lorenzo Bianconi <[email protected]>
[ Upstream commit 4df942733fd26d9378a4a00619be348c771e0190 ]
Fix restore value configured in MT_BBP(IBI, 9) register in mt76x0_phy_recalibrate_after_assoc routine.
--- drivers/net/wireless/mediatek/mt76/mt76x0/phy.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76x0/phy.c +3 -4
@@ -793,9 +793,8 @@ void mt76x0_phy_recalibrate_after_assoc(struct mt76x0_dev *dev)mt76_wr (dev,MT_TX_ALC_CFG_0 ,0 );usleep_range (500 ,700 ); - reg_val =mt76_rr (dev,0x2124 ); - reg_val &=0xffffff7e ; -mt76_wr (dev,0x2124 , reg_val); + reg_val =mt76_rr (dev,MT_BBP (IBI ,9 )); +mt76_wr (dev,MT_BBP (IBI ,9 ),0xffffff7e );mt76x0_mcu_calibrate (dev,MCU_CAL_RXDCOC ,0 );
@@ -806,7 +805,7 @@ void mt76x0_phy_recalibrate_after_assoc(struct mt76x0_dev *dev)mt76x0_mcu_calibrate (dev,MCU_CAL_RXIQ , is_5ghz);mt76x0_mcu_calibrate (dev,MCU_CAL_RX_GROUP_DELAY , is_5ghz); -mt76_wr (dev,0x2124 , reg_val); +mt76_wr (dev,MT_BBP (IBI ,9 ), reg_val);mt76_wr (dev,MT_TX_ALC_CFG_0 , tx_alc);msleep (100 );
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 18/237 brcmsmac: AP mode: update beacon when TIM changes
In reply to Sasha LevinFrom: Ali MJ Al-Nasrawy <[email protected]>
[ Upstream commit 2258ee58baa554609a3cc3996276e4276f537b6d ]
Beacons are not updated to reflect TIM changes. This is not compliant with power-saving client stations as the beacons do not have valid TIM and can cause the network to stall at random occasions and to have highly variable latencies.
Fix it by updating beacon templates on mac80211 set_tim callback.
Addresses an issue described in:
https://marc.info/?i=20180911163534.21312d08%20()%20manjaro
--- .../broadcom/brcm80211/brcmsmac/mac80211_if.c | 26 +++++++++++++++++++ .../broadcom/brcm80211/brcmsmac/main.h | 1 + 2 files changed, 27 insertions(+)
drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c +26 -0
@@ -502,6 +502,7 @@ brcms_ops_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif) }spin_lock_bh (&wl->lock); + wl->wlc->vif = vif; wl->mute_tx = false;brcms_c_mute (wl->wlc, false);if (vif->type ==NL80211_IFTYPE_STATION )
@@ -519,6 +520,11 @@ brcms_ops_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)static void brcms_ops_remove_interface (struct ieee80211_hw *hw,struct ieee80211_vif *vif) { +struct brcms_info *wl = hw->priv; + +spin_lock_bh (&wl->lock); + wl->wlc->vif =NULL ; +spin_unlock_bh (&wl->lock); }static int brcms_ops_config (struct ieee80211_hw *hw,u32 changed)
@@ -937,6 +943,25 @@ static void brcms_ops_set_tsf(struct ieee80211_hw *hw,spin_unlock_bh (&wl->lock); } +static int brcms_ops_beacon_set_tim (struct ieee80211_hw *hw, +struct ieee80211_sta *sta,bool set) +{ +struct brcms_info *wl = hw->priv; +struct sk_buff *beacon =NULL ; +u16 tim_offset =0 ; + +spin_lock_bh (&wl->lock); +if (wl->wlc->vif) + beacon =ieee80211_beacon_get_tim (hw, wl->wlc->vif, + &tim_offset,NULL ); +if (beacon) +brcms_c_set_new_beacon (wl->wlc, beacon, tim_offset, + wl->wlc->vif->bss_conf.dtim_period); +spin_unlock_bh (&wl->lock); + +return 0 ; +} +static const struct ieee80211_ops brcms_ops = { .tx = brcms_ops_tx, .start = brcms_ops_start,
@@ -955,6 +980,7 @@ static const struct ieee80211_ops brcms_ops = { .flush = brcms_ops_flush, .get_tsf = brcms_ops_get_tsf, .set_tsf = brcms_ops_set_tsf, + .set_tim = brcms_ops_beacon_set_tim, };void brcms_dpc (unsigned long data)
drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.h +1 -0
@@ -563,6 +563,7 @@ struct brcms_c_info {struct wiphy *wiphy;struct scb pri_scb; +struct ieee80211_vif *vif;struct sk_buff *beacon;u16 beacon_tim_offset;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 19/237 ath10k: set probe request oui during driver start
In reply to Sasha LevinFrom: Rakesh Pillai <[email protected]>
[ Upstream commit f1157695c527d4ee949ac83f743f80107751a70c ]
Currently the wmi command for setting probe request oui, needed for mac randomization, is sent during the mac register. At this time, during the driver init the wmi has already been detached. This can cause unexpected behavior since the firmware is already down and the wmi has been detached.
Send the wmi command for setting probe request oui during the driver start. This will make sure that the firmware is started and wmi is initialized before we send this command.
Tested HW: WCN3990
Tested FW: WLAN.HL.2.0-01188-QCAHLSWMTPLZ-1
--- drivers/net/wireless/ath/ath10k/mac.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
drivers/net/wireless/ath/ath10k/mac.c +8 -6
@@ -4685,6 +4685,14 @@ static int ath10k_start(struct ieee80211_hw *hw) goto err_core_stop; } +if (test_bit (WMI_SERVICE_SPOOF_MAC_SUPPORT , ar->wmi.svc_map)) { + ret =ath10k_wmi_scan_prob_req_oui (ar, ar->mac_addr); +if (ret) { +ath10k_err (ar,"failed to set prob req oui: %i\n" , ret); + goto err_core_stop; + } + } +if (test_bit (WMI_SERVICE_ADAPTIVE_OCS , ar->wmi.svc_map)) { ret =ath10k_wmi_adaptive_qcs (ar, true);if (ret) {
@@ -8549,12 +8557,6 @@ int ath10k_mac_register(struct ath10k *ar) }if (test_bit (WMI_SERVICE_SPOOF_MAC_SUPPORT , ar->wmi.svc_map)) { - ret =ath10k_wmi_scan_prob_req_oui (ar, ar->mac_addr); -if (ret) { -ath10k_err (ar,"failed to set prob req oui: %i\n" , ret); - goto err_dfs_detector_exit; - } - ar->hw->wiphy->features |=NL80211_FEATURE_SCAN_RANDOM_MAC_ADDR ; }
Signature · 7 lines
2.20.1 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
Sasha Levin
maintainerPATCH 20/237 ath10k: allocate small size dma memory in ath10k_pci_diag_write_mem
In reply to Sasha LevinFrom: Carl Huang <[email protected]>
[ Upstream commit 0738b4998c6d1caf9ca2447b946709a7278c70f1 ]
ath10k_pci_diag_write_mem may allocate big size of the dma memory based on the parameter nbytes. Take firmware diag download as example, the biggest size is about 500K. In some systems, the allocation is likely to fail because it can't acquire such a large contiguous dma memory.
The fix is to allocate a small size dma memory. In the loop, driver copies the data to the allocated dma memory and writes to the destination until all the data is written.
Tested with QCA6174 PCI with firmware-6.bin_WLAN.RM.4.4.1-00119-QCARMSWP-1, this also affects QCA9377 PCI.
--- drivers/net/wireless/ath/ath10k/pci.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-)
drivers/net/wireless/ath/ath10k/pci.c +11 -12
@@ -1054,10 +1054,9 @@ int ath10k_pci_diag_write_mem(struct ath10k *ar, u32 address,struct ath10k_ce *ce =ath10k_ce_priv (ar);int ret =0 ;u32 *buf; -unsigned int completed_nbytes, orig_nbytes, remaining_bytes; +unsigned int completed_nbytes, alloc_nbytes, remaining_bytes;struct ath10k_ce_pipe *ce_diag;void *data_buf =NULL ; -u32 ce_data;/* Host buffer address in CE space */ dma_addr_t ce_data_base =0 ;int i;
@@ -1071,9 +1070,10 @@ int ath10k_pci_diag_write_mem(struct ath10k *ar, u32 address,* 1) 4-byte alignment * 2) Buffer in DMA-able space */ - orig_nbytes = nbytes; + alloc_nbytes = min_t(unsigned int, nbytes, DIAG_TRANSFER_LIMIT); + data_buf = (unsigned char *)dma_alloc_coherent (ar->dev, - orig_nbytes, + alloc_nbytes, &ce_data_base,GFP_ATOMIC );if (!data_buf) {
@@ -1081,9 +1081,6 @@ int ath10k_pci_diag_write_mem(struct ath10k *ar, u32 address, goto done; } -/* Copy caller's data to allocated DMA buf */ -memcpy (data_buf, data, orig_nbytes); -/* * The address supplied by the caller is in the * Target CPU virtual address space.
@@ -1096,12 +1093,14 @@ int ath10k_pci_diag_write_mem(struct ath10k *ar, u32 address,*/ address =ath10k_pci_targ_cpu_to_ce_addr (ar, address); - remaining_bytes = orig_nbytes; - ce_data = ce_data_base; + remaining_bytes = nbytes;while (remaining_bytes) {/* FIXME: check cast */ nbytes =min_t (int, remaining_bytes,DIAG_TRANSFER_LIMIT ); +/* Copy caller's data to allocated DMA buf */ +memcpy (data_buf, data, nbytes); +/* Set up to receive directly into Target(!) address */ ret = ce_diag->ops->ce_rx_post_buf (ce_diag, &address, address);if (ret !=0 )
@@ -1111,7 +1110,7 @@ int ath10k_pci_diag_write_mem(struct ath10k *ar, u32 address,* Request CE to send caller-supplied data that * was copied to bounce buffer to Target(!) address. */ - ret =ath10k_ce_send_nolock (ce_diag,NULL , (u32 )ce_data, + ret =ath10k_ce_send_nolock (ce_diag,NULL , ce_data_base, nbytes,0 ,0 );if (ret !=0 ) goto done;
@@ -1152,12 +1151,12 @@ int ath10k_pci_diag_write_mem(struct ath10k *ar, u32 address, remaining_bytes -= nbytes; address += nbytes; - ce_data += nbytes; + data += nbytes; } done:if (data_buf) { -dma_free_coherent (ar->dev, orig_nbytes, data_buf, +dma_free_coherent (ar->dev, alloc_nbytes, data_buf, ce_data_base); }
Signature · 7 lines
2.20.1 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
Sasha Levin
maintainerPATCH 21/237 skd: fixup usage of legacy IO API
In reply to Sasha LevinFrom: Jens Axboe <[email protected]>
[ Upstream commit 6d1f9dfde7343c4ebfb8f84dcb333af571bb3b22 ]
We need to be using the mq variant of request requeue here.
--- drivers/block/skd_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/block/skd_main.c +2 -2
@@ -1416,7 +1416,7 @@ static void skd_resolve_req_exception(struct skd_device *skdev,case SKD_CHECK_STATUS_BUSY_IMMINENT :skd_log_skreq (skdev, skreq,"retry(busy)" ); -blk_requeue_request (skdev->queue, req); +blk_mq_requeue_request (req, true);dev_info (&skdev->pdev->dev,"drive BUSY imminent\n" ); skdev->state =SKD_DRVR_STATE_BUSY_IMMINENT ; skdev->timer_countdown =SKD_TIMER_MINUTES (20 );
@@ -1426,7 +1426,7 @@ static void skd_resolve_req_exception(struct skd_device *skdev,case SKD_CHECK_STATUS_REQUEUE_REQUEST :if ((unsigned long ) ++req->special <SKD_MAX_RETRIES ) {skd_log_skreq (skdev, skreq,"retry" ); -blk_requeue_request (skdev->queue, req); +blk_mq_requeue_request (req, true);break ; }/* fall through */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 22/237 cdrom: don't attempt to fiddle with cdo->capability
In reply to Sasha LevinFrom: Jens Axboe <[email protected]>
[ Upstream commit 8f94004e2a51a3ea195cf3447eb5d5906f36d8b3 ]
We can't modify cdo->capability as it is defined as a const. Change the modification hack to just WARN_ON_ONCE() if we hit any of the invalid combinations.
This fixes a regression for pcd, which doesn't work after the constify patch.
--- drivers/cdrom/cdrom.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-)
drivers/cdrom/cdrom.c +13 -14
@@ -411,10 +411,10 @@ static int cdrom_get_disc_info(struct cdrom_device_info *cdi,* hack to have the capability flags defined const, while we can still * change it here without gcc complaining at every line. */ -#define ENSURE (call, bits) \ -do { \ - if (cdo->call == NULL) \ - *change_capability &= ~(bits); \ +#define ENSURE (cdo, call, bits) \ +do { \ + if (cdo->call == NULL) \ + WARN_ON_ONCE((cdo)->capability & (bits)); \ } while (0)/*
@@ -590,7 +590,6 @@ int register_cdrom(struct cdrom_device_info *cdi) {static char banner_printed;const struct cdrom_device_ops *cdo = cdi->ops; -int *change_capability = (int *)&cdo->capability;/* hack */ cd_dbg (CD_OPEN ,"entering register_cdrom\n" );
@@ -602,16 +601,16 @@ int register_cdrom(struct cdrom_device_info *cdi)cdrom_sysctl_register (); } -ENSURE (drive_status,CDC_DRIVE_STATUS ); +ENSURE (cdo, drive_status,CDC_DRIVE_STATUS );if (cdo->check_events ==NULL && cdo->media_changed ==NULL ) - *change_capability = ~(CDC_MEDIA_CHANGED |CDC_SELECT_DISC ); -ENSURE (tray_move,CDC_CLOSE_TRAY |CDC_OPEN_TRAY ); -ENSURE (lock_door,CDC_LOCK ); -ENSURE (select_speed,CDC_SELECT_SPEED ); -ENSURE (get_last_session,CDC_MULTI_SESSION ); -ENSURE (get_mcn,CDC_MCN ); -ENSURE (reset,CDC_RESET ); -ENSURE (generic_packet,CDC_GENERIC_PACKET ); +WARN_ON_ONCE (cdo->capability & (CDC_MEDIA_CHANGED |CDC_SELECT_DISC )); +ENSURE (cdo, tray_move,CDC_CLOSE_TRAY |CDC_OPEN_TRAY ); +ENSURE (cdo, lock_door,CDC_LOCK ); +ENSURE (cdo, select_speed,CDC_SELECT_SPEED ); +ENSURE (cdo, get_last_session,CDC_MULTI_SESSION ); +ENSURE (cdo, get_mcn,CDC_MCN ); +ENSURE (cdo, reset,CDC_RESET ); +ENSURE (cdo, generic_packet,CDC_GENERIC_PACKET ); cdi->mc_flags =0 ; cdi->options =CDO_USE_FFLAGS ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 23/237 spi: sh-msiof: fix deferred probing
In reply to Sasha LevinFrom: Sergei Shtylyov <[email protected]>
[ Upstream commit f34c6e6257aa477cdfe7e9bbbecd3c5648ecda69 ]
Since commit 9ec36cafe43b ("of/irq: do irq resolution in platform_get_irq") platform_get_irq() can return -EPROBE_DEFER. However, the driver overrides an error returned by that function with -ENOENT which breaks the deferred probing. Propagate upstream an error code returned by platform_get_irq() and remove the bogus "platform" from the error message, while at it...
--- drivers/spi/spi-sh-msiof.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/spi/spi-sh-msiof.c +2 -2
@@ -1343,8 +1343,8 @@ static int sh_msiof_spi_probe(struct platform_device *pdev) i =platform_get_irq (pdev,0 );if (i <0 ) { -dev_err (&pdev->dev,"cannot get platform IRQ\n" ); - ret = -ENOENT ; +dev_err (&pdev->dev,"cannot get IRQ\n" ); + ret = i; goto err1; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 24/237 mmc: mediatek: fill the actual clock for mmc debugfs
In reply to Sasha LevinFrom: Chaotian Jing <[email protected]>
[ Upstream commit 56f6cbbed0463f1c78d602b17c315916cc1cd238 ]
as the mmc core layer has the mmc->actual_clock, so fill it and drop msdc_host->sclk.
--- drivers/mmc/host/mtk-sd.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/mmc/host/mtk-sd.c +7 -6
@@ -390,7 +390,6 @@ struct msdc_host {struct clk *src_clk_cg;/* msdc source clock control gate */ u32 mclk;/* mmc subsystem clock frequency */ u32 src_clk_freq;/* source clock frequency */ -u32 sclk;/* SD/MS bus clock frequency */ unsigned char timing;bool vqmmc_enabled;u32 latch_ck;
@@ -635,10 +634,10 @@ static void msdc_set_timeout(struct msdc_host *host, u32 ns, u32 clks) host->timeout_ns = ns; host->timeout_clks = clks; -if (host->sclk ==0 ) { +if (host->mmc->actual_clock ==0 ) { timeout =0 ; }else { - clk_ns =1000000000UL / host->sclk; + clk_ns =1000000000UL / host->mmc->actual_clock; timeout = (ns + clk_ns -1 ) / clk_ns + clks;/* in 1048576 sclk cycle unit */ timeout = (timeout + (0x1 <<20 ) -1 ) >>20 ;
@@ -683,6 +682,7 @@ static void msdc_set_mclk(struct msdc_host *host, unsigned char timing, u32 hz)if (!hz) {dev_dbg (host->dev,"set mclk to 0\n" ); host->mclk =0 ; + host->mmc->actual_clock =0 ;sdr_clr_bits (host->base +MSDC_CFG ,MSDC_CFG_CKPDN );return ; }
@@ -761,7 +761,7 @@ static void msdc_set_mclk(struct msdc_host *host, unsigned char timing, u32 hz)while (!(readl (host->base +MSDC_CFG ) &MSDC_CFG_CKSTB ))cpu_relax ();sdr_set_bits (host->base +MSDC_CFG ,MSDC_CFG_CKPDN ); - host->sclk = sclk; + host->mmc->actual_clock = sclk; host->mclk = hz; host->timing = timing;/* need because clk changed. */
@@ -772,7 +772,7 @@ static void msdc_set_mclk(struct msdc_host *host, unsigned char timing, u32 hz)* mmc_select_hs400() will drop to 50Mhz and High speed mode, * tune result of hs200/200Mhz is not suitable for 50Mhz */ -if (host->sclk <=52000000 ) { +if (host->mmc->actual_clock <=52000000 ) {writel (host->def_tune_para.iocon, host->base +MSDC_IOCON );writel (host->def_tune_para.pad_tune, host->base + tune_reg); }else {
@@ -787,7 +787,8 @@ static void msdc_set_mclk(struct msdc_host *host, unsigned char timing, u32 hz)sdr_set_field (host->base + tune_reg,MSDC_PAD_TUNE_CMDRRDLY , host->hs400_cmd_int_delay); -dev_dbg (host->dev,"sclk: %d, timing: %d\n" , host->sclk, timing); +dev_dbg (host->dev,"sclk: %d, timing: %d\n" , host->mmc->actual_clock, + timing); } static inline u32 msdc_cmd_find_resp(struct msdc_host *host,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 25/237 mmc: mediatek: fix cannot receive new request when msdc_cmd_is_ready fail
In reply to Sasha LevinFrom: Chaotian Jing <[email protected]>
[ Upstream commit f38a9774ddde9d79b3487dd888edd8b8623552af ]
when msdc_cmd_is_ready return fail, the req_timeout work has not been inited and cancel_delayed_work() will return false, then, the request return directly and never call mmc_request_done().
so need call mod_delayed_work() before msdc_cmd_is_ready()
--- drivers/mmc/host/mtk-sd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mmc/host/mtk-sd.c +1 -1
@@ -1056,6 +1056,7 @@ static void msdc_start_command(struct msdc_host *host,WARN_ON (host->cmd); host->cmd = cmd; +mod_delayed_work (system_wq, &host->req_timeout,DAT_TIMEOUT );if (!msdc_cmd_is_ready (host, mrq, cmd))return ;
@@ -1067,7 +1068,6 @@ static void msdc_start_command(struct msdc_host *host, cmd->error =0 ; rawcmd =msdc_cmd_prepare_raw_cmd (host, mrq, cmd); -mod_delayed_work (system_wq, &host->req_timeout,DAT_TIMEOUT );sdr_set_bits (host->base +MSDC_INTEN , cmd_ints_mask);writel (cmd->arg, host->base +SDC_ARG );
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 26/237 PCI: mediatek: Fix class type for MT7622 to PCI_CLASS_BRIDGE_PCI
In reply to Sasha LevinFrom: Honghui Zhang <[email protected]>
[ Upstream commit a7f172ab6a8e755e60311f27512034b0441ef421 ]
commit 101c92dc80c8 ("PCI: mediatek: Set up vendor ID and class type for MT7622") erroneously set the class type for MT7622 to PCI_CLASS_BRIDGE_HOST.
The PCIe controller of MT7622 integrates a Root Port that has type 1 configuration space header and related bridge windows.
The HW default value of this bridge's class type is invalid.
Fix its class type and set it to PCI_CLASS_BRIDGE_PCI to match the hardware implementation.
--- drivers/pci/controller/pcie-mediatek.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/controller/pcie-mediatek.c +1 -1
@@ -432,7 +432,7 @@ static int mtk_pcie_startup_port_v2(struct mtk_pcie_port *port) val =PCI_VENDOR_ID_MEDIATEK ;writew (val, port->base +PCIE_CONF_VEND_ID ); - val =PCI_CLASS_BRIDGE_HOST ; + val =PCI_CLASS_BRIDGE_PCI ;writew (val, port->base +PCIE_CONF_CLASS_ID ); }
Signature · 7 lines
2.20.1 _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
Sasha Levin
maintainerPATCH 27/237 btrfs: defrag: use btrfs_mod_outstanding_extents in cluster_pages_for_defrag
In reply to Sasha LevinFrom: Su Yue <[email protected]>
[ Upstream commit 28c4a3e21ad030d7571ee9b1b246a5cbfd886627 ]
Since commit 8b62f87bad9c ("Btrfs: rework outstanding_extents"), manual operations of outstanding_extent in btrfs_inode are replaced by btrfs_mod_outstanding_extents().
The one in cluster_pages_for_defrag seems to be lost, so replace it of btrfs_mod_outstanding_extents().
--- fs/btrfs/ioctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/btrfs/ioctl.c +1 -1
@@ -1337,7 +1337,7 @@ static int cluster_pages_for_defrag(struct inode *inode,if (i_done != page_cnt) {spin_lock (&BTRFS_I (inode)->lock); -BTRFS_I (inode)->outstanding_extents++; +btrfs_mod_outstanding_extents (BTRFS_I (inode),1 );spin_unlock (&BTRFS_I (inode)->lock); btrfs_delalloc_release_space(inode, data_reserved, start_index << PAGE_SHIFT,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 28/237 Btrfs: fix alignment in declaration and prototype of btrfs_get_extent
In reply to Sasha LevinFrom: Liu Bo <[email protected]>
[ Upstream commit de2c6615dcddf2af868c5cbd1db2e9e73b4beb58 ]
This fixes btrfs_get_extent to be consistent with our existing declaration style.
Note: For the record, indentation styles that are accepted are both, aligning under the opening ( and tab or double tab indentation on the next line. Preferrably not spliting the type or long expressions in the argument lists.
--- fs/btrfs/ctree.h | 4 ++-- fs/btrfs/inode.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-)
fs/btrfs/ctree.h +2 -2
@@ -3183,8 +3183,8 @@ struct inode *btrfs_iget_path(struct super_block *s, struct btrfs_key *location,struct inode *btrfs_iget (struct super_block *s,struct btrfs_key *location,struct btrfs_root *root,int *was_new);struct extent_map *btrfs_get_extent (struct btrfs_inode *inode, -struct page *page,size_t pg_offset, -u64 start,u64 end,int create); +struct page *page,size_t pg_offset, +u64 start,u64 end,int create);int btrfs_update_inode (struct btrfs_trans_handle *trans,struct btrfs_root *root,struct inode *inode);
fs/btrfs/inode.c +3 -3
@@ -6862,9 +6862,9 @@ static noinline int uncompress_inline(struct btrfs_path *path,* This also copies inline extents directly into the page. */ struct extent_map *btrfs_get_extent (struct btrfs_inode *inode, -struct page *page, -size_t pg_offset,u64 start,u64 len, -int create) +struct page *page, +size_t pg_offset,u64 start,u64 len, +int create) {struct btrfs_fs_info *fs_info = inode->root->fs_info;int ret;
Signature · 1 line
2.20.1
Re: [PATCH AUTOSEL 4.19 028/237] Btrfs: fix alignment in declaration and prototype of btrfs_get_extent
Quoted 6 lines · Sasha Levin
From: Liu Bo <[email protected]>
[ Upstream commit
de2c6615dcddf2af868c5cbd1db2e9e73b4beb58]This fixes
btrfs_get_extentto be consistent with our existing declaration style.
The patch is pure white space fix with no effects. I don't see that it would be needed for a followup patch. What was the reason to add it to autosel/stable ?
Sasha Levin
maintainerRe: [PATCH AUTOSEL 4.19 028/237] Btrfs: fix alignment in declaration and prototype of btrfs_get_extent
Quoted 11 lines · David Sterba
Quoted 6 lines · Sasha Levin
From: Liu Bo <[email protected]>
[ Upstream commit
de2c6615dcddf2af868c5cbd1db2e9e73b4beb58]This fixes
btrfs_get_extentto be consistent with our existing declaration style.The patch is pure white space fix with no effects. I don't see that it would be needed for a followup patch. What was the reason to add it to autosel/stable ?
Oh I grabbed it as a dependency for a follow up patch which I ended up dropping, and forgot this one in. I'll drop it as well, sorry for the noise.
Signature · 2 lines
Thanks, Sasha
Sasha Levin
maintainerPATCH 29/237 btrfs: handle error of get_old_root
In reply to Sasha LevinFrom: Nikolay Borisov <[email protected]>
[ Upstream commit 315bed43fea532650933e7bba316a7601d439edf ]
In btrfs_search_old_slot get_old_root is always used with the assumption it cannot fail. However, this is not true in rare circumstance it can fail and return null. This will lead to null point dereference when the header is read. Fix this by checking the return value and properly handling NULL by setting ret to -EIO and returning gracefully.
Coverity-id: 1087503
--- fs/btrfs/ctree.c | 4 ++++ 1 file changed, 4 insertions(+)
fs/btrfs/ctree.c +4 -0
@@ -3031,6 +3031,10 @@ int btrfs_search_old_slot(struct btrfs_root *root, const struct btrfs_key *key, again: b =get_old_root (root, time_seq); +if (!b) { + ret = -EIO ; + goto done; + } level =btrfs_header_level (b); p->locks[level] =BTRFS_READ_LOCK ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 30/237 gsmi: Fix bug in append_to_eventlog sysfs handler
In reply to Sasha LevinFrom: Duncan Laurie <[email protected]>
[ Upstream commit 655603de68469adaff16842ac17a5aec9c9ce89b ]
The sysfs handler should return the number of bytes consumed, which in the case of a successful write is the entire buffer. Also fix a bug where param.data_len was being set to (count - (2 * sizeof(u32))) instead of just (count - sizeof(u32)). The latter is correct because we skip over the leading u32 which is our param.type, but we were also incorrectly subtracting sizeof(u32) on the line where we were actually setting param.data_len:
param.data_len = count - sizeof(u32);
This meant that for our example event.kernel_software_watchdog with total length 10 bytes, param.data_len was just 2 prior to this change.
To test, successfully append an event to the log with gsmi sysfs. This sample event is for a "Kernel Software Watchdog"
Quoted 1 line
xxd -g 1 event.kernel_software_watchdog
0000000: 01 00 00 00 ad de 06 00 00 00
Quoted 3 lines
cat event.kernel_software_watchdog >
/sys/firmware/gsmi/append_to_eventlogmosys eventlog list | tail -1
14 | 2012-06-25 10:14:14 | Kernl Event | Software Watchdog
--- drivers/firmware/google/gsmi.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/firmware/google/gsmi.c +2 -3
@@ -480,11 +480,10 @@ static ssize_t eventlog_write(struct file *filp, struct kobject *kobj,if (count <sizeof (u32))return -EINVAL ; param.type = *(u32 *)buf; - count -=sizeof (u32); buf +=sizeof (u32);/* The remaining buffer is the data payload */ -if (count > gsmi_dev.data_buf->length) +if ((count -sizeof (u32)) > gsmi_dev.data_buf->length)return -EINVAL ; param.data_len = count -sizeof (u32);
@@ -504,7 +503,7 @@ static ssize_t eventlog_write(struct file *filp, struct kobject *kobj,spin_unlock_irqrestore (&gsmi_dev.lock, flags); -return rc; +return (rc ==0 ) ? count : rc; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 31/237 misc: mic: fix a DMA pool free failure
In reply to Sasha LevinFrom: Wenwen Wang <[email protected]>
[ Upstream commit 6b995f4eec34745f6cb20d66d5277611f0b3c3fa ]
In _scif_prog_signal(), the boolean variable 'x100' is used to indicate whether the MIC Coprocessor is X100. If 'x100' is true, the status descriptor will be used to write the value to the destination. Otherwise, a DMA pool will be allocated for this purpose. Specifically, if the DMA pool is allocated successfully, two memory addresses will be returned. One is for the CPU and the other is for the device to access the DMA pool. The former is stored to the variable 'status' and the latter is stored to the variable 'src'. After the allocation, the address in 'src' is saved to 'status->src_dma_addr', which is actually in the DMA pool, and 'src' is then modified.
Later on, if an error occurs, the execution flow will transfer to the label 'dma_fail', which will check 'x100' and free up the allocated DMA pool if 'x100' is false. The point here is that 'status->src_dma_addr' is used for freeing up the DMA pool. As mentioned before, 'status->src_dma_addr' is in the DMA pool. And thus, the device is able to modify this data. This can potentially cause failures when freeing up the DMA pool because of the modified device address.
This patch avoids the above issue by using the variable 'src' (with necessary calculation) to free up the DMA pool.
--- drivers/misc/mic/scif/scif_fence.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/misc/mic/scif/scif_fence.c +1 -1
@@ -272,7 +272,7 @@ static int _scif_prog_signal(scif_epd_t epd, dma_addr_t dst, u64 val) dma_fail:if (!x100)dma_pool_free (ep->remote_dev->signal_pool, status, - status->src_dma_addr); + src - offsetof(struct scif_status , val)); alloc_fail:return err; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 32/237 w1: IAD Register is yet readable trough iad sys file. Fix snprintf (%u for unsigned, count for max size).
In reply to Sasha LevinFrom: Julien Folly <[email protected]>
[ Upstream commit 6eaafbb6998e999467cf78a76e155ee00e372b14 ]
IAD Register is yet readable trough the "iad" sys file.
A write to the "iad" sys file enables or disables the current measurement, but it was not possible to get the measured value by reading it.
Fix: %u in snprintf for unsigned values (vdd and vad)
Fix: Avoid possibles overflows (Usage of the 'count' variables)
--- drivers/w1/slaves/w1_ds2438.c | 66 +++++++++++++++++++++++++++-------- 1 file changed, 52 insertions(+), 14 deletions(-)
drivers/w1/slaves/w1_ds2438.c +52 -14
@@ -186,8 +186,8 @@ static int w1_ds2438_change_config_bit(struct w1_slave *sl, u8 mask, u8 value)return -1 ; } -static uint16_t w1_ds2438_get_voltage (struct w1_slave *sl, -int adc_input,uint16_t *voltage) +static int w1_ds2438_get_voltage (struct w1_slave *sl, +int adc_input,uint16_t *voltage) {unsigned int retries =W1_DS2438_RETRIES ;u8 w1_buf[DS2438_PAGE_SIZE +1 /*for CRC*/ ];
@@ -235,6 +235,25 @@ static uint16_t w1_ds2438_get_voltage(struct w1_slave *sl,return ret; } +static int w1_ds2438_get_current (struct w1_slave *sl,int16_t *voltage) +{ +u8 w1_buf[DS2438_PAGE_SIZE +1 /*for CRC*/ ]; +int ret; + +mutex_lock (&sl->master->bus_mutex); + +if (w1_ds2438_get_page (sl,0 , w1_buf) ==0 ) { +/* The voltage measured across current sense resistor RSENS. */ + *voltage = (((int16_t ) w1_buf[DS2438_CURRENT_MSB ]) <<8 ) | ((int16_t ) w1_buf[DS2438_CURRENT_LSB ]); + ret =0 ; + }else + ret =-1 ; + +mutex_unlock (&sl->master->bus_mutex); + +return ret; +} +static ssize_t iad_write (struct file *filp,struct kobject *kobj,struct bin_attribute *bin_attr,char *buf,loff_t off,size_t count)
@@ -257,6 +276,27 @@ static ssize_t iad_write(struct file *filp, struct kobject *kobj,return ret; } +static ssize_t iad_read (struct file *filp,struct kobject *kobj, +struct bin_attribute *bin_attr,char *buf, +loff_t off,size_t count) +{ +struct w1_slave *sl =kobj_to_w1_slave (kobj); +int ret; +int16_t voltage; + +if (off !=0 ) +return 0 ; +if (!buf) +return -EINVAL ; + +if (w1_ds2438_get_current (sl, &voltage) ==0 ) { + ret =snprintf (buf, count,"%i\n" , voltage); + }else + ret = -EIO ; + +return ret; +} +static ssize_t page0_read (struct file *filp,struct kobject *kobj,struct bin_attribute *bin_attr,char *buf,loff_t off,size_t count)
@@ -272,9 +312,13 @@ static ssize_t page0_read(struct file *filp, struct kobject *kobj,mutex_lock (&sl->master->bus_mutex); +/* Read no more than page0 size */ +if (count >DS2438_PAGE_SIZE ) + count =DS2438_PAGE_SIZE ; +if (w1_ds2438_get_page (sl,0 , w1_buf) ==0 ) { -memcpy (buf, &w1_buf,DS2438_PAGE_SIZE ); - ret =DS2438_PAGE_SIZE ; +memcpy (buf, &w1_buf, count); + ret = count; }else ret = -EIO ;
@@ -289,7 +333,6 @@ static ssize_t temperature_read(struct file *filp, struct kobject *kobj, {struct w1_slave *sl =kobj_to_w1_slave (kobj);int ret; -ssize_t c =PAGE_SIZE ;int16_t temp;if (off !=0 )
@@ -298,8 +341,7 @@ static ssize_t temperature_read(struct file *filp, struct kobject *kobj,return -EINVAL ;if (w1_ds2438_get_temperature (sl, &temp) ==0 ) { - c -=snprintf (buf +PAGE_SIZE - c, c,"%d\n" , temp); - ret =PAGE_SIZE - c; + ret =snprintf (buf, count,"%i\n" , temp); }else ret = -EIO ;
@@ -312,7 +354,6 @@ static ssize_t vad_read(struct file *filp, struct kobject *kobj, {struct w1_slave *sl =kobj_to_w1_slave (kobj);int ret; -ssize_t c =PAGE_SIZE ;uint16_t voltage;if (off !=0 )
@@ -321,8 +362,7 @@ static ssize_t vad_read(struct file *filp, struct kobject *kobj,return -EINVAL ;if (w1_ds2438_get_voltage (sl,DS2438_ADC_INPUT_VAD , &voltage) ==0 ) { - c -=snprintf (buf +PAGE_SIZE - c, c,"%d\n" , voltage); - ret =PAGE_SIZE - c; + ret =snprintf (buf, count,"%u\n" , voltage); }else ret = -EIO ;
@@ -335,7 +375,6 @@ static ssize_t vdd_read(struct file *filp, struct kobject *kobj, {struct w1_slave *sl =kobj_to_w1_slave (kobj);int ret; -ssize_t c =PAGE_SIZE ;uint16_t voltage;if (off !=0 )
@@ -344,15 +383,14 @@ static ssize_t vdd_read(struct file *filp, struct kobject *kobj,return -EINVAL ;if (w1_ds2438_get_voltage (sl,DS2438_ADC_INPUT_VDD , &voltage) ==0 ) { - c -=snprintf (buf +PAGE_SIZE - c, c,"%d\n" , voltage); - ret =PAGE_SIZE - c; + ret =snprintf (buf, count,"%u\n" , voltage); }else ret = -EIO ;return ret; } -static BIN_ATTR(iad, S_IRUGO | S_IWUSR | S_IWGRP, NULL, iad_write, 1); +static BIN_ATTR(iad, S_IRUGO | S_IWUSR | S_IWGRP, iad_read, iad_write, 0); static BIN_ATTR_RO(page0, DS2438_PAGE_SIZE); static BIN_ATTR_RO(temperature, 0/* real length varies */); static BIN_ATTR_RO(vad, 0/* real length varies */);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 33/237 m68k: fix command-line parsing when passed from u-boot
In reply to Sasha LevinFrom: Angelo Dureghello <[email protected]>
[ Upstream commit 381fdd62c38344a771aed06adaf14aae65c47454 ]
This patch fixes command_line array zero-terminated one byte over the end of the array, causing boot to hang.
--- arch/m68k/kernel/uboot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/m68k/kernel/uboot.c +1 -1
@@ -102,5 +102,5 @@ __init void process_uboot_commandline(char *commandp, int size) }parse_uboot_commandline (commandp, len); - commandp[size -1 ] =0 ; + commandp[len -1 ] =0 ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 34/237 scsi: hisi_sas: Feed back linkrate(max/min) when re-attached
In reply to Sasha LevinFrom: Luo Jiaxing <[email protected]>
[ Upstream commit 5a54691f874ab29ec82f08bc6936866a3ccdaa91 ]
At directly attached situation, if the user modifies the sysfs interface of maximum_linkrate and minimum_linkrate to renegotiate the linkrate between SAS controller and target, the value of both files mentioned above should have change to user setting after renegotiate is over, but it remains unchanged.
To fix this bug, maximum_linkrate and minimum_linkrate will be directly fed back to relevant sas_phy structure.
--- drivers/scsi/hisi_sas/hisi_sas_main.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/scsi/hisi_sas/hisi_sas_main.c +3 -0
@@ -906,6 +906,9 @@ static void hisi_sas_phy_set_linkrate(struct hisi_hba *hisi_hba, int phy_no, _r.maximum_linkrate = max; _r.minimum_linkrate = min; + sas_phy->phy->maximum_linkrate = max; + sas_phy->phy->minimum_linkrate = min; + hisi_hba->hw->phy_disable (hisi_hba, phy_no);msleep (100 ); hisi_hba->hw->phy_set_linkrate (hisi_hba, phy_no, &_r);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 35/237 scsi: hisi_sas: Fix the race between IO completion and timeout for SMP/internal IO
In reply to Sasha LevinFrom: Xiang Chen <[email protected]>
[ Upstream commit 584f53fe5f529d877968c711a095923c1ed12307 ]
If SMP/internal IO times out, we will possibly free the task immediately.
However if the IO actually completes at the same time, the IO completion may refer to task which has been freed.
So to solve the issue, flush the tasklet to finish IO completion before free'ing slot/task.
--- drivers/scsi/hisi_sas/hisi_sas_main.c | 55 ++++++++++++++++++++++----- 1 file changed, 46 insertions(+), 9 deletions(-)
drivers/scsi/hisi_sas/hisi_sas_main.c +46 -9
@@ -955,8 +955,7 @@ static int hisi_sas_control_phy(struct asd_sas_phy *sas_phy, enum phy_func func,static void hisi_sas_task_done (struct sas_task *task) { -if (!del_timer (&task->slow_task->timer)) -return ; +del_timer (&task->slow_task->timer);complete (&task->slow_task->completion); }
@@ -965,13 +964,17 @@ static void hisi_sas_tmf_timedout(struct timer_list *t)struct sas_task_slow *slow =from_timer (slow, t, timer);struct sas_task *task = slow->task;unsigned long flags; +bool is_completed = true;spin_lock_irqsave (&task->task_state_lock, flags); -if (!(task->task_state_flags &SAS_TASK_STATE_DONE )) +if (!(task->task_state_flags &SAS_TASK_STATE_DONE )) { task->task_state_flags |=SAS_TASK_STATE_ABORTED ; + is_completed = false; + }spin_unlock_irqrestore (&task->task_state_lock, flags); -complete (&task->slow_task->completion); +if (!is_completed) +complete (&task->slow_task->completion); }#define TASK_TIMEOUT 20
@@ -1022,10 +1025,18 @@ static int hisi_sas_exec_internal_tmf_task(struct domain_device *device,if ((task->task_state_flags &SAS_TASK_STATE_ABORTED )) {if (!(task->task_state_flags &SAS_TASK_STATE_DONE )) {struct hisi_sas_slot *slot = task->lldd_task; +struct hisi_sas_cq *cq = + &hisi_hba->cq[slot->dlvry_queue];dev_err (dev,"abort tmf: TMF task timeout and not done\n" ); -if (slot) +if (slot) { +/* +* flush tasklet to avoid free'ing task +* before using task in IO completion +*/ +tasklet_kill (&cq->tasklet); slot->task =NULL ; + } goto ex_err; }else
@@ -1401,6 +1412,17 @@ static int hisi_sas_abort_task(struct sas_task *task)spin_lock_irqsave (&task->task_state_lock, flags);if (task->task_state_flags &SAS_TASK_STATE_DONE ) { +struct hisi_sas_slot *slot = task->lldd_task; +struct hisi_sas_cq *cq; + +if (slot) { +/* +* flush tasklet to avoid free'ing task +* before using task in IO completion +*/ + cq = &hisi_hba->cq[slot->dlvry_queue]; +tasklet_kill (&cq->tasklet); + }spin_unlock_irqrestore (&task->task_state_lock, flags); rc =TMF_RESP_FUNC_COMPLETE ; goto out;
@@ -1456,12 +1478,19 @@ static int hisi_sas_abort_task(struct sas_task *task)/* SMP */ struct hisi_sas_slot *slot = task->lldd_task;u32 tag = slot->idx; +struct hisi_sas_cq *cq = &hisi_hba->cq[slot->dlvry_queue]; rc =hisi_sas_internal_task_abort (hisi_hba, device,HISI_SAS_INT_ABT_CMD , tag);if (((rc <0 ) || (rc ==TMF_RESP_FUNC_FAILED )) && - task->lldd_task) -hisi_sas_do_release_task (hisi_hba, task, slot); + task->lldd_task) { +/* +* flush tasklet to avoid free'ing task +* before using task in IO completion +*/ +tasklet_kill (&cq->tasklet); + slot->task =NULL ; + } } out:
@@ -1827,9 +1856,17 @@ hisi_sas_internal_task_abort(struct hisi_hba *hisi_hba,if ((task->task_state_flags &SAS_TASK_STATE_ABORTED )) {if (!(task->task_state_flags &SAS_TASK_STATE_DONE )) {struct hisi_sas_slot *slot = task->lldd_task; - -if (slot) +struct hisi_sas_cq *cq = + &hisi_hba->cq[slot->dlvry_queue]; + +if (slot) { +/* +* flush tasklet to avoid free'ing task +* before using task in IO completion +*/ +tasklet_kill (&cq->tasklet); slot->task =NULL ; + }dev_err (dev,"internal task abort: timeout and not done.\n" ); res = -EIO ; goto exit;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 36/237 scsi: hisi_sas: Free slot later in slot_complete_vx_hw()
In reply to Sasha LevinFrom: Xiang Chen <[email protected]>
[ Upstream commit 3e178f3ecfcf91a258e832b0f0843a4cfd9059ac ]
If an SSP/SMP IO times out, it may be actually in reality be simultaneously processing completion of the slot in slot_complete_vx_hw().
Then if the slot is freed in slot_complete_vx_hw() (this IPTT is freed and it may be re-used by other slot), and we may abort the wrong slot in hisi_sas_abort_task().
So to solve the issue, free the slot after the check of SAS_TASK_STATE_ABORTED in slot_complete_vx_hw().
--- drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 2 +- drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/hisi_sas/hisi_sas_v2_hw.c +1 -1
@@ -2481,7 +2481,6 @@ slot_complete_v2_hw(struct hisi_hba *hisi_hba, struct hisi_sas_slot *slot) } out: -hisi_sas_slot_task_free (hisi_hba, task, slot); sts = ts->stat;spin_lock_irqsave (&task->task_state_lock, flags);if (task->task_state_flags &SAS_TASK_STATE_ABORTED ) {
@@ -2491,6 +2490,7 @@ slot_complete_v2_hw(struct hisi_hba *hisi_hba, struct hisi_sas_slot *slot) } task->task_state_flags |=SAS_TASK_STATE_DONE ;spin_unlock_irqrestore (&task->task_state_lock, flags); +hisi_sas_slot_task_free (hisi_hba, task, slot);if (!is_internal && (task->task_proto !=SAS_PROTOCOL_SMP )) {spin_lock_irqsave (&device->done_lock, flags);
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +1 -1
@@ -1749,7 +1749,6 @@ slot_complete_v3_hw(struct hisi_hba *hisi_hba, struct hisi_sas_slot *slot) } out: -hisi_sas_slot_task_free (hisi_hba, task, slot); sts = ts->stat;spin_lock_irqsave (&task->task_state_lock, flags);if (task->task_state_flags &SAS_TASK_STATE_ABORTED ) {
@@ -1759,6 +1758,7 @@ slot_complete_v3_hw(struct hisi_hba *hisi_hba, struct hisi_sas_slot *slot) } task->task_state_flags |=SAS_TASK_STATE_DONE ;spin_unlock_irqrestore (&task->task_state_lock, flags); +hisi_sas_slot_task_free (hisi_hba, task, slot);if (!is_internal && (task->task_proto !=SAS_PROTOCOL_SMP )) {spin_lock_irqsave (&device->done_lock, flags);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 37/237 net: ethernet: ti: cpsw: fix lost of mcast packets while rx_mode update
In reply to Sasha LevinFrom: Ivan Khoronzhuk <[email protected]>
[ Upstream commit 5da1948969bc1991920987ce4361ea56046e5a98 ]
Whenever kernel or user decides to call rx mode update, it clears every multicast entry from forwarding table and in some time adds it again. This time can be enough to drop incoming multicast packets.
That's why clear only staled multicast entries and update or add new one afterwards.
--- drivers/net/ethernet/ti/cpsw.c | 46 +++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 18 deletions(-)
drivers/net/ethernet/ti/cpsw.c +28 -18
@@ -570,7 +570,7 @@ static inline int cpsw_get_slave_port(u32 slave_num)return slave_num +1 ; } -static void cpsw_add_mcast (struct cpsw_priv *priv,u8 *addr) +static void cpsw_add_mcast (struct cpsw_priv *priv,const u8 *addr) {struct cpsw_common *cpsw = priv->cpsw;
@@ -662,16 +662,35 @@ static void cpsw_set_promiscious(struct net_device *ndev, bool enable) } } -static void cpsw_ndo_set_rx_mode (struct net_device *ndev) +static int cpsw_add_mc_addr (struct net_device *ndev,const u8 *addr) +{ +struct cpsw_priv *priv =netdev_priv (ndev); + +cpsw_add_mcast (priv, addr); +return 0 ; +} + +static int cpsw_del_mc_addr (struct net_device *ndev,const u8 *addr) {struct cpsw_priv *priv =netdev_priv (ndev);struct cpsw_common *cpsw = priv->cpsw; -int vid; +int vid, flags; -if (cpsw->data.dual_emac) +if (cpsw->data.dual_emac) { vid = cpsw->slaves[priv->emac_port].port_vlan; -else - vid = cpsw->data.default_vlan; + flags =ALE_VLAN ; + }else { + vid =0 ; + flags =0 ; + } + +cpsw_ale_del_mcast (cpsw->ale, addr,0 , flags, vid); +return 0 ; +} + +static void cpsw_ndo_set_rx_mode (struct net_device *ndev) +{ +struct cpsw_common *cpsw =ndev_to_cpsw (ndev);if (ndev->flags &IFF_PROMISC ) {/* Enable promiscuous mode */
@@ -684,19 +703,9 @@ static void cpsw_ndo_set_rx_mode(struct net_device *ndev) }/* Restore allmulti on vlans if necessary */ -cpsw_ale_set_allmulti (cpsw->ale, priv->ndev->flags &IFF_ALLMULTI ); - -/* Clear all mcast from ALE */ -cpsw_ale_flush_multicast (cpsw->ale,ALE_ALL_PORTS , vid); +cpsw_ale_set_allmulti (cpsw->ale, ndev->flags &IFF_ALLMULTI ); -if (!netdev_mc_empty (ndev)) { -struct netdev_hw_addr *ha; - -/* program multicast address list into ALE register */ -netdev_for_each_mc_addr (ha, ndev) { -cpsw_add_mcast (priv, ha->addr); - } - } +__dev_mc_sync (ndev, cpsw_add_mc_addr, cpsw_del_mc_addr); }static void cpsw_intr_enable (struct cpsw_common *cpsw)
@@ -1956,6 +1965,7 @@ static int cpsw_ndo_stop(struct net_device *ndev)struct cpsw_common *cpsw = priv->cpsw;cpsw_info (priv, ifdown,"shutting down cpsw device\n" ); +__dev_mc_unsync (priv->ndev, cpsw_del_mc_addr);netif_tx_stop_all_queues (priv->ndev);netif_carrier_off (priv->ndev);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 38/237 RDMA/bnxt_re: Avoid NULL check after accessing the pointer
In reply to Sasha LevinFrom: Selvin Xavier <[email protected]>
[ Upstream commit eae4ad1b0c9a77ef0cbac212d58d46976eaacfc1 ]
This is reported by smatch check. rcfw->creq_bar_reg_iomem is accessed in bnxt_qplib_rcfw_stop_irq and this variable check afterwards doesn't make sense. Also, rcfw->creq_bar_reg_iomem will never be NULL. So Removing this check.
--- drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
drivers/infiniband/hw/bnxt_re/qplib_rcfw.c +6 -7
@@ -614,13 +614,8 @@ void bnxt_qplib_disable_rcfw_channel(struct bnxt_qplib_rcfw *rcfw)bnxt_qplib_rcfw_stop_irq (rcfw, true); -if (rcfw->cmdq_bar_reg_iomem) -iounmap (rcfw->cmdq_bar_reg_iomem); - rcfw->cmdq_bar_reg_iomem =NULL ; - -if (rcfw->creq_bar_reg_iomem) -iounmap (rcfw->creq_bar_reg_iomem); - rcfw->creq_bar_reg_iomem =NULL ; +iounmap (rcfw->cmdq_bar_reg_iomem); +iounmap (rcfw->creq_bar_reg_iomem); indx =find_first_bit (rcfw->cmdq_bitmap, rcfw->bmap_size);if (indx != rcfw->bmap_size)
@@ -629,6 +624,8 @@ void bnxt_qplib_disable_rcfw_channel(struct bnxt_qplib_rcfw *rcfw)kfree (rcfw->cmdq_bitmap); rcfw->bmap_size =0 ; + rcfw->cmdq_bar_reg_iomem =NULL ; + rcfw->creq_bar_reg_iomem =NULL ; rcfw->aeq_handler =NULL ; rcfw->vector =0 ; }
@@ -714,6 +711,8 @@ int bnxt_qplib_enable_rcfw_channel(struct pci_dev *pdev,dev_err (&rcfw->pdev->dev,"QPLIB: CREQ BAR region %d mapping failed" , rcfw->creq_bar_reg); +iounmap (rcfw->cmdq_bar_reg_iomem); + rcfw->cmdq_bar_reg_iomem =NULL ;return -ENOMEM ; } rcfw->creq_qp_event_processed =0 ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 39/237 RDMA/bnxt_re: Fix qp async event reporting
In reply to Sasha LevinFrom: Devesh Sharma <[email protected]>
[ Upstream commit 4c01f2e3a906a0d2d798be5751c331cf501bc129 ]
Reports affiliated async event on the qp-async event channel instead of global event channel.
--- drivers/infiniband/hw/bnxt_re/main.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/infiniband/hw/bnxt_re/main.c +9 -4
@@ -989,12 +989,17 @@ static void bnxt_re_dispatch_event(struct ib_device *ibdev, struct ib_qp *qp,struct ib_event ib_event; ib_event.device = ibdev; -if (qp) +if (qp) { ib_event.element.qp = qp; -else + ib_event.event = event; +if (qp->event_handler) + qp->event_handler (&ib_event, qp->qp_context); + + }else { ib_event.element.port_num = port_num; - ib_event.event = event; -ib_dispatch_event (&ib_event); + ib_event.event = event; +ib_dispatch_event (&ib_event); + } }#define HWRM_QUEUE_PRI2COS_QCFG_INPUT_FLAGS_IVLAN 0x02
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 40/237 RDMA/bnxt_re: Avoid resource leak in case the NQ registration fails
In reply to Sasha LevinFrom: Selvin Xavier <[email protected]>
[ Upstream commit 5df950994934814a8b91f0cf9f653842d2ba082d ]
In case the NQ alloc/enable fails, free up the already allocated/enabled NQ before reporting failure. Also, track the alloc/enable using proper state checking.
--- drivers/infiniband/hw/bnxt_re/bnxt_re.h | 2 ++ drivers/infiniband/hw/bnxt_re/main.c | 31 ++++++++++++++++++------- 2 files changed, 24 insertions(+), 9 deletions(-)
drivers/infiniband/hw/bnxt_re/bnxt_re.h +2 -0
@@ -120,6 +120,8 @@ struct bnxt_re_dev {#define BNXT_RE_FLAG_HAVE_L2_REF 3#define BNXT_RE_FLAG_RCFW_CHANNEL_EN 4#define BNXT_RE_FLAG_QOS_WORK_REG 5 +#define BNXT_RE_FLAG_RESOURCES_ALLOCATED 7 +#define BNXT_RE_FLAG_RESOURCES_INITIALIZED 8#define BNXT_RE_FLAG_ISSUE_ROCE_STATS 29struct net_device *netdev;unsigned int version, major, minor;
drivers/infiniband/hw/bnxt_re/main.c +22 -9
@@ -864,10 +864,8 @@ static void bnxt_re_cleanup_res(struct bnxt_re_dev *rdev) {int i; -if (rdev->nq[0 ].hwq.max_elements) { -for (i =1 ; i < rdev->num_msix; i++) -bnxt_qplib_disable_nq (&rdev->nq[i -1 ]); - } +for (i =1 ; i < rdev->num_msix; i++) +bnxt_qplib_disable_nq (&rdev->nq[i -1 ]);if (rdev->qplib_res.rcfw)bnxt_qplib_cleanup_res (&rdev->qplib_res);
@@ -876,6 +874,7 @@ static void bnxt_re_cleanup_res(struct bnxt_re_dev *rdev)static int bnxt_re_init_res (struct bnxt_re_dev *rdev) {int rc =0 , i; +int num_vec_enabled =0 ;bnxt_qplib_init_res (&rdev->qplib_res);
@@ -891,9 +890,13 @@ static int bnxt_re_init_res(struct bnxt_re_dev *rdev) "Failed to enable NQ with rc = 0x%x", rc); goto fail; } + num_vec_enabled++; }return 0 ; fail: +for (i = num_vec_enabled; i >=0 ; i--) +bnxt_qplib_disable_nq (&rdev->nq[i]); +return rc; }
@@ -925,6 +928,7 @@ static void bnxt_re_free_res(struct bnxt_re_dev *rdev)static int bnxt_re_alloc_res (struct bnxt_re_dev *rdev) {int rc =0 , i; +int num_vec_created =0 ;/* Configure and allocate resources for qplib */ rdev->qplib_res.rcfw = &rdev->rcfw;
@@ -951,7 +955,7 @@ static int bnxt_re_alloc_res(struct bnxt_re_dev *rdev)if (rc) {dev_err (rdev_to_dev (rdev),"Alloc Failed NQ%d rc:%#x" , i, rc); - goto dealloc_dpi; + goto free_nq; } rc = bnxt_re_net_ring_alloc (rdev, rdev->nq[i].hwq.pbl[PBL_LVL_0].pg_map_arr,
@@ -964,14 +968,17 @@ static int bnxt_re_alloc_res(struct bnxt_re_dev *rdev)dev_err (rdev_to_dev (rdev),"Failed to allocate NQ fw id with rc = 0x%x" , rc); +bnxt_qplib_free_nq (&rdev->nq[i]); goto free_nq; } + num_vec_created++; }return 0 ; free_nq: -for (i =0 ; i < rdev->num_msix -1 ; i++) +for (i = num_vec_created; i >=0 ; i--) { +bnxt_re_net_ring_free (rdev, rdev->nq[i].ring_id);bnxt_qplib_free_nq (&rdev->nq[i]); -dealloc_dpi: + }bnxt_qplib_dealloc_dpi (&rdev->qplib_res, &rdev->qplib_res.dpi_tbl, &rdev->dpi_privileged);
@@ -1206,8 +1213,11 @@ static void bnxt_re_ib_unreg(struct bnxt_re_dev *rdev)if (test_and_clear_bit (BNXT_RE_FLAG_QOS_WORK_REG , &rdev->flags))cancel_delayed_work (&rdev->worker); -bnxt_re_cleanup_res (rdev); -bnxt_re_free_res (rdev); +if (test_and_clear_bit (BNXT_RE_FLAG_RESOURCES_INITIALIZED , + &rdev->flags)) +bnxt_re_cleanup_res (rdev); +if (test_and_clear_bit (BNXT_RE_FLAG_RESOURCES_ALLOCATED , &rdev->flags)) +bnxt_re_free_res (rdev);if (test_and_clear_bit (BNXT_RE_FLAG_RCFW_CHANNEL_EN , &rdev->flags)) { rc =bnxt_qplib_deinit_rcfw (&rdev->rcfw);
@@ -1337,12 +1347,15 @@ static int bnxt_re_ib_reg(struct bnxt_re_dev *rdev)pr_err ("Failed to allocate resources: %#x\n" , rc); goto fail; } +set_bit (BNXT_RE_FLAG_RESOURCES_ALLOCATED , &rdev->flags); rc =bnxt_re_init_res (rdev);if (rc) {pr_err ("Failed to initialize resources: %#x\n" , rc); goto fail; } +set_bit (BNXT_RE_FLAG_RESOURCES_INITIALIZED , &rdev->flags); +if (!rdev->is_virtfn) { rc =bnxt_re_setup_qos (rdev);if (rc)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 41/237 pinctrl: sunxi: Fix a memory leak in 'sunxi_pinctrl_build_state()'
In reply to Sasha LevinFrom: Christophe JAILLET <[email protected]>
[ Upstream commit a93a676b079144009f55fff2ab0e34c3b7258c8a ]
If 'krealloc()' fails, 'pctl->functions' is set to NULL. We should instead use a temp variable in order to be able to free the previously allocated memeory, in case of OOM.
--- drivers/pinctrl/sunxi/pinctrl-sunxi.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/pinctrl/sunxi/pinctrl-sunxi.c +7 -4
@@ -1042,6 +1042,7 @@ static int sunxi_pinctrl_add_function(struct sunxi_pinctrl *pctl,static int sunxi_pinctrl_build_state (struct platform_device *pdev) {struct sunxi_pinctrl *pctl =platform_get_drvdata (pdev); +void *ptr;int i;/*
@@ -1108,13 +1109,15 @@ static int sunxi_pinctrl_build_state(struct platform_device *pdev) }/* And now allocated and fill the array for real */ - pctl->functions =krealloc (pctl->functions, - pctl->nfunctions *sizeof (*pctl->functions), -GFP_KERNEL ); -if (!pctl->functions) { + ptr =krealloc (pctl->functions, + pctl->nfunctions *sizeof (*pctl->functions), +GFP_KERNEL ); +if (!ptr) {kfree (pctl->functions); + pctl->functions =NULL ;return -ENOMEM ; } + pctl->functions = ptr;for (i =0 ; i < pctl->desc->npins; i++) {const struct sunxi_desc_pin *pin = pctl->desc->pins + i;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 42/237 pwm: lpss: Only set update bit if we are actually changing the settings
In reply to Sasha LevinFrom: Hans de Goede <[email protected]>
[ Upstream commit 2153bbc12f77fb2203276befc0f0dddbfb023bb1 ]
According to the datasheet the update bit must be set if the on-time-div or the base-unit changes.
Now that we properly order device resume on Cherry Trail so that the GFX0 _PS0 method no longer exits with an error, we end up with a sequence of events where we are writing the same values twice in a row.
First the _PS0 method restores the duty cycle of 0% the GPU driver set on suspend and then the GPU driver first updates just the enabled bit in the pwm_state from 0 to 1, causing us to write the same values again, before restoring the pre-suspend duty-cycle in a separate pwm_apply call.
When writing the update bit the second time, without changing any of the values the update bit clears immediately / instantly, instead of staying 1 for a while as usual. After this the next setting of the update bit seems to be ignored, causing the restoring of the pre-suspend duty-cycle to not get applied. This makes the backlight come up with a 0% dutycycle after suspend/resume.
Any further brightness changes after this do work.
This commit moves the setting of the update bit into pwm_lpss_prepare() and only sets the bit if we have actually changed any of the values.
This avoids the setting of the update bit the second time we configure the PWM to 0% dutycycle, this fixes the backlight coming up with 0% duty-cycle after a suspend/resume.
--- drivers/pwm/pwm-lpss.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/pwm/pwm-lpss.c +7 -5
@@ -97,7 +97,7 @@ static void pwm_lpss_prepare(struct pwm_lpss_chip *lpwm, struct pwm_device *pwm,unsigned long long on_time_div;unsigned long c = lpwm->info->clk_rate, base_unit_range;unsigned long long base_unit, freq =NSEC_PER_SEC ; -u32 ctrl; +u32 orig_ctrl, ctrl;do_div (freq, period_ns);
@@ -114,13 +114,17 @@ static void pwm_lpss_prepare(struct pwm_lpss_chip *lpwm, struct pwm_device *pwm,do_div (on_time_div, period_ns); on_time_div =255ULL - on_time_div; - ctrl =pwm_lpss_read (pwm); + orig_ctrl = ctrl =pwm_lpss_read (pwm); ctrl &= ~PWM_ON_TIME_DIV_MASK ; ctrl &= ~(base_unit_range <<PWM_BASE_UNIT_SHIFT ); base_unit &= base_unit_range; ctrl |= (u32 ) base_unit <<PWM_BASE_UNIT_SHIFT ; ctrl |= on_time_div; -pwm_lpss_write (pwm, ctrl); + +if (orig_ctrl != ctrl) { +pwm_lpss_write (pwm, ctrl); +pwm_lpss_write (pwm, ctrl |PWM_SW_UPDATE ); + } }static inline void pwm_lpss_cond_enable (struct pwm_device *pwm,bool cond)
@@ -144,7 +148,6 @@ static int pwm_lpss_apply(struct pwm_chip *chip, struct pwm_device *pwm,return ret; }pwm_lpss_prepare (lpwm, pwm, state->duty_cycle, state->period); -pwm_lpss_write (pwm,pwm_lpss_read (pwm) |PWM_SW_UPDATE );pwm_lpss_cond_enable (pwm, lpwm->info->bypass == false); ret =pwm_lpss_wait_for_update (pwm);if (ret) {
@@ -157,7 +160,6 @@ static int pwm_lpss_apply(struct pwm_chip *chip, struct pwm_device *pwm,if (ret)return ret;pwm_lpss_prepare (lpwm, pwm, state->duty_cycle, state->period); -pwm_lpss_write (pwm,pwm_lpss_read (pwm) |PWM_SW_UPDATE );return pwm_lpss_wait_for_update (pwm); } }else if (pwm_is_enabled (pwm)) {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 43/237 amiflop: clean up on errors during setup
In reply to Sasha LevinFrom: Omar Sandoval <[email protected]>
[ Upstream commit 53d0f8dbde89cf6c862c7a62e00c6123e02cba41 ]
The error handling in fd_probe_drives() doesn't clean up at all. Fix it up in preparation for converting to blk-mq. While we're here, get rid of the commented out amiga_floppy_remove().
--- drivers/block/amiflop.c | 84 ++++++++++++++++++++--------------------- 1 file changed, 40 insertions(+), 44 deletions(-)
drivers/block/amiflop.c +40 -44
@@ -1701,11 +1701,41 @@ static const struct block_device_operations floppy_fops = { .check_events = amiga_check_events, }; +static struct gendisk *fd_alloc_disk (int drive) +{ +struct gendisk *disk; + + disk =alloc_disk (1 ); +if (!disk) + goto out; + + disk->queue =blk_init_queue (do_fd_request, &amiflop_lock); +if (IS_ERR (disk->queue)) { + disk->queue =NULL ; + goto out_put_disk; + } + + unit[drive].trackbuf =kmalloc (FLOPPY_MAX_SECTORS *512 ,GFP_KERNEL ); +if (!unit[drive].trackbuf) + goto out_cleanup_queue; + +return disk; + +out_cleanup_queue: +blk_cleanup_queue (disk->queue); + disk->queue =NULL ; +out_put_disk: +put_disk (disk); +out: + unit[drive].type->code =FD_NODRIVE ; +return NULL ; +} +static int __init fd_probe_drives (void ) {int drive,drives,nomem; -printk (KERN_INFO "FD: probing units\nfound " ); +pr_info ("FD: probing units\nfound" ); drives=0 ; nomem=0 ;for (drive=0 ;drive<FD_MAX_UNITS ;drive++) {
@@ -1713,27 +1743,17 @@ static int __init fd_probe_drives(void)fd_probe (drive);if (unit[drive].type->code ==FD_NODRIVE )continue ; - disk =alloc_disk (1 ); + + disk =fd_alloc_disk (drive);if (!disk) { - unit[drive].type->code =FD_NODRIVE ; +pr_cont (" no mem for fd%d" , drive); + nomem =1 ;continue ; } unit[drive].gendisk = disk; - - disk->queue =blk_init_queue (do_fd_request, &amiflop_lock); -if (!disk->queue) { - unit[drive].type->code =FD_NODRIVE ; -continue ; - } - drives++; -if ((unit[drive].trackbuf =kmalloc (FLOPPY_MAX_SECTORS *512 ,GFP_KERNEL )) ==NULL ) { -printk ("no mem for " ); - unit[drive].type = &drive_types[num_dr_types -1 ];/* FD_NODRIVE */ - drives--; - nomem =1 ; - } -printk ("fd%d " ,drive); + +pr_cont (" fd%d" ,drive); disk->major =FLOPPY_MAJOR ; disk->first_minor = drive; disk->fops = &floppy_fops;
@@ -1744,11 +1764,11 @@ static int __init fd_probe_drives(void) }if ((drives >0 ) || (nomem ==0 )) {if (drives ==0 ) -printk ("no drives" ); -printk ("\n" ); +pr_cont (" no drives" ); +pr_cont ("\n" );return drives; } -printk ("\n" ); +pr_cont ("\n" );return -ENOMEM ; }
@@ -1831,30 +1851,6 @@ static int __init amiga_floppy_probe(struct platform_device *pdev)return ret; } -#if 0 /* not safe to unload */ -static int __exit amiga_floppy_remove(struct platform_device *pdev) -{ -int i; - -for ( i =0 ; i <FD_MAX_UNITS ; i++) { -if (unit[i].type->code !=FD_NODRIVE ) { -struct request_queue *q = unit[i].gendisk->queue; -del_gendisk (unit[i].gendisk); -put_disk (unit[i].gendisk); -kfree (unit[i].trackbuf); -if (q) -blk_cleanup_queue (q); - } - } -blk_unregister_region (MKDEV (FLOPPY_MAJOR ,0 ),256 ); -free_irq (IRQ_AMIGA_CIAA_TB ,NULL ); -free_irq (IRQ_AMIGA_DSKBLK ,NULL ); - custom.dmacon =DMAF_DISK ;/* disable DMA */ -amiga_chip_free (raw_buf); -unregister_blkdev (FLOPPY_MAJOR ,"fd" ); -} -#endif -static struct platform_driver amiga_floppy_driver = { .driver = { .name ="amiga-floppy" ,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 44/237 qed: Align local and global PTT to propagate through the APIs.
In reply to Sasha LevinFrom: Rahul Verma <[email protected]>
[ Upstream commit 706d08913d1f68610c32b4a001026aa989878dd9 ]
Align the use of local PTT to propagate through the qed_mcp* API's. Global ptt should not be used.
Register access should be done through layers. Register address is mapped into a PTT, PF translation table. Several interface functions require a PTT to direct read/write into register. There is a pool of PTT maintained, and several PTT are used simultaneously to access device registers in different flows. Same PTT should not be used in flows that can run concurrently.
To avoid running out of PTT resources, too many PTT should not be acquired without releasing them. Every PF has a global PTT, which is used throughout the life of PF, in most important flows for register access. Generic functions acquire the PTT locally and release after the use. This patch aligns the use of Global PTT and Local PTT accordingly.
--- drivers/net/ethernet/qlogic/qed/qed.h | 2 +- drivers/net/ethernet/qlogic/qed/qed_main.c | 22 ++++++++++++++---- drivers/net/ethernet/qlogic/qed/qed_mcp.c | 27 ++++++++++------------ drivers/net/ethernet/qlogic/qed/qed_mcp.h | 5 ++-- drivers/net/ethernet/qlogic/qed/qed_vf.c | 2 +- 5 files changed, 35 insertions(+), 23 deletions(-)
drivers/net/ethernet/qlogic/qed/qed.h +1 -1
@@ -914,7 +914,7 @@ u16 qed_get_cm_pq_idx_llt_mtc(struct qed_hwfn *p_hwfn, u8 tc);/* Prototypes */ int qed_fill_dev_info (struct qed_dev *cdev,struct qed_dev_info *dev_info); -void qed_link_update (struct qed_hwfn *hwfn); +void qed_link_update (struct qed_hwfn *hwfn,struct qed_ptt *ptt);u32 qed_unzip_data (struct qed_hwfn *p_hwfn,u32 input_len,u8 *input_buf,u32 max_size,u8 *unzip_buf);
drivers/net/ethernet/qlogic/qed/qed_main.c +18 -4
@@ -1462,6 +1462,7 @@ static int qed_get_link_data(struct qed_hwfn *hwfn, }static void qed_fill_link (struct qed_hwfn *hwfn, +struct qed_ptt *ptt,struct qed_link_output *if_link) {struct qed_mcp_link_params params;
@@ -1542,7 +1543,7 @@ static void qed_fill_link(struct qed_hwfn *hwfn,/* TODO - fill duplex properly */ if_link->duplex =DUPLEX_FULL ; -qed_mcp_get_media_type (hwfn->cdev, &media_type); +qed_mcp_get_media_type (hwfn, ptt, &media_type); if_link->port =qed_get_port_type (media_type); if_link->autoneg = params.speed.autoneg;
@@ -1598,21 +1599,34 @@ static void qed_fill_link(struct qed_hwfn *hwfn,static void qed_get_current_link (struct qed_dev *cdev,struct qed_link_output *if_link) { +struct qed_hwfn *hwfn; +struct qed_ptt *ptt;int i; -qed_fill_link (&cdev->hwfns[0 ], if_link); + hwfn = &cdev->hwfns[0 ]; +if (IS_PF (cdev)) { + ptt =qed_ptt_acquire (hwfn); +if (ptt) { +qed_fill_link (hwfn, ptt, if_link); +qed_ptt_release (hwfn, ptt); + }else { +DP_NOTICE (hwfn,"Failed to fill link; No PTT\n" ); + } + }else { +qed_fill_link (hwfn,NULL , if_link); + }for_each_hwfn (cdev, i)qed_inform_vf_link_state (&cdev->hwfns[i]); } -void qed_link_update (struct qed_hwfn *hwfn) +void qed_link_update (struct qed_hwfn *hwfn,struct qed_ptt *ptt) {void *cookie = hwfn->cdev->ops_cookie;struct qed_common_cb_ops *op = hwfn->cdev->protocol_ops.common;struct qed_link_output if_link; -qed_fill_link (hwfn, &if_link); +qed_fill_link (hwfn, ptt, &if_link);qed_inform_vf_link_state (hwfn);if (IS_LEAD_HWFN (hwfn) && cookie)
drivers/net/ethernet/qlogic/qed/qed_mcp.c +12 -15
@@ -1382,7 +1382,7 @@ static void qed_mcp_handle_link_change(struct qed_hwfn *p_hwfn,if (p_hwfn->mcp_info->capabilities &FW_MB_PARAM_FEATURE_SUPPORT_EEE )qed_mcp_read_eee_config (p_hwfn, p_ptt, p_link); -qed_link_update (p_hwfn); +qed_link_update (p_hwfn, p_ptt); out:spin_unlock_bh (&p_hwfn->mcp_info->link_lock); }
@@ -1849,12 +1849,10 @@ int qed_mcp_get_mbi_ver(struct qed_hwfn *p_hwfn,return 0 ; } -int qed_mcp_get_media_type (struct qed_dev *cdev,u32 *p_media_type) +int qed_mcp_get_media_type (struct qed_hwfn *p_hwfn, +struct qed_ptt *p_ptt,u32 *p_media_type) { -struct qed_hwfn *p_hwfn = &cdev->hwfns[0 ]; -struct qed_ptt *p_ptt; - -if (IS_VF (cdev)) +if (IS_VF (p_hwfn->cdev))return -EINVAL ;if (!qed_mcp_is_init (p_hwfn)) {
@@ -1862,16 +1860,15 @@ int qed_mcp_get_media_type(struct qed_dev *cdev, u32 *p_media_type)return -EBUSY ; } - *p_media_type =MEDIA_UNSPECIFIED ; - - p_ptt =qed_ptt_acquire (p_hwfn); -if (!p_ptt) -return -EBUSY ; - - *p_media_type =qed_rd (p_hwfn, p_ptt, p_hwfn->mcp_info->port_addr + - offsetof(struct public_port , media_type)); +if (!p_ptt) { + *p_media_type =MEDIA_UNSPECIFIED ; +return -EINVAL ; + } -qed_ptt_release (p_hwfn, p_ptt); + *p_media_type =qed_rd (p_hwfn, p_ptt, + p_hwfn->mcp_info->port_addr + + offsetof(struct public_port , + media_type));return 0 ; }
drivers/net/ethernet/qlogic/qed/qed_mcp.h +3 -2
@@ -322,14 +322,15 @@ int qed_mcp_get_mbi_ver(struct qed_hwfn *p_hwfn,* @brief Get media type value of the port. * * @param cdev - qed dev pointer +* @param p_ptt * @param mfw_ver - media type value * * @return int - * 0 - Operation was successul. * -EBUSY - Operation failed */ -int qed_mcp_get_media_type (struct qed_dev *cdev, -u32 *media_type); +int qed_mcp_get_media_type (struct qed_hwfn *p_hwfn, +struct qed_ptt *p_ptt,u32 *media_type);/** * @brief General function for sending commands to the MCP
drivers/net/ethernet/qlogic/qed/qed_vf.c +1 -1
@@ -1698,7 +1698,7 @@ static void qed_handle_bulletin_change(struct qed_hwfn *hwfn) ops->ports_update (cookie, vxlan_port, geneve_port);/* Always update link configuration according to bulletin */ -qed_link_update (hwfn); +qed_link_update (hwfn,NULL ); }void qed_iov_vf_task (struct work_struct *work)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 45/237 scsi: ips: fix missing break in switch
In reply to Sasha LevinFrom: "Gustavo A. R. Silva" <[email protected]>
[ Upstream commit 5d25ff7a544889bc4b749fda31778d6a18dddbcb ]
Add missing break statement in order to prevent the code from falling through to case TEST_UNIT_READY.
Addresses-Coverity-ID: 1357338 ("Missing break in switch")
--- drivers/scsi/ips.c | 1 + 1 file changed, 1 insertion(+)
drivers/scsi/ips.c +1 -0
@@ -3485,6 +3485,7 @@ ips_send_cmd(ips_ha_t * ha, ips_scb_t * scb)case START_STOP : scb->scsi_cmd->result =DID_OK <<16 ; +break ;case TEST_UNIT_READY :case INQUIRY :
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 46/237 nfp: bpf: protect against mis-initializing atomic counters
In reply to Sasha LevinFrom: Jakub Kicinski <[email protected]>
[ Upstream commit 527db74b71ee5a279f818aae51f2c26b4e5c7648 ]
Atomic operations on the NFP are currently always in big endian. The driver keeps track of regions of memory storing atomic values and byte swaps them accordingly. There are corner cases where the map values may be initialized before the driver knows they are used as atomic counters. This can happen either when the datapath is performing the update and the stack contents are unknown or when map is updated before the program which will use it for atomic values is loaded.
To avoid situation where user initializes the value to 0 1 2 3 and then after loading a program which uses the word as an atomic counter starts reading 3 2 1 0 - only allow atomic counters to be initialized to endian-neutral values.
For updates from the datapath the stack information may not be as precise, so just allow initializing such values to 0.
Example code which would break:
struct bpf_map_def SEC("maps") rxcnt = {
.type = BPF_MAP_TYPE_HASH,
.key_size = sizeof(__u32),
.value_size = sizeof(__u64),
.max_entries = 1,
};int xdp_prog1()
{
__u64 nonzeroval = 3;
__u32 key = 0;
__u64 *value;
value = bpf_map_lookup_elem(&rxcnt, &key);
if (!value)
bpf_map_update_elem(&rxcnt, &key, &nonzeroval, BPF_ANY);
else
__sync_fetch_and_add(value, 1);
return XDP_PASS;
}$ offload bpftool map dump key: 00 00 00 00 value: 00 00 00 03 00 00 00 00
should be:
$ offload bpftool map dump key: 00 00 00 00 value: 03 00 00 00 00 00 00 00
--- drivers/net/ethernet/netronome/nfp/bpf/main.h | 7 ++- .../net/ethernet/netronome/nfp/bpf/offload.c | 18 +++++- .../net/ethernet/netronome/nfp/bpf/verifier.c | 58 +++++++++++++++++-- 3 files changed, 76 insertions(+), 7 deletions(-)
drivers/net/ethernet/netronome/nfp/bpf/main.h +6 -1
@@ -206,6 +206,11 @@ enum nfp_bpf_map_use { NFP_MAP_USE_ATOMIC_CNT, }; +struct nfp_bpf_map_word { +unsigned char type :4 ; +unsigned char non_zero_update :1 ; +}; +/** * struct nfp_bpf_map - private per-map data attached to BPF maps for offload * @offmap: pointer to the offloaded BPF map
@@ -219,7 +224,7 @@ struct nfp_bpf_map {struct nfp_app_bpf *bpf;u32 tid;struct list_head l; -enum nfp_bpf_map_use use_map[]; +struct nfp_bpf_map_word use_map[]; };struct nfp_bpf_neutral_map {
drivers/net/ethernet/netronome/nfp/bpf/offload.c +17 -1
@@ -299,10 +299,25 @@ static void nfp_map_bpf_byte_swap(struct nfp_bpf_map *nfp_map, void *value)unsigned int i;for (i =0 ; i <DIV_ROUND_UP (nfp_map->offmap->map.value_size,4 ); i++) -if (nfp_map->use_map[i] ==NFP_MAP_USE_ATOMIC_CNT ) +if (nfp_map->use_map[i].type ==NFP_MAP_USE_ATOMIC_CNT ) word[i] = (__force u32 )cpu_to_be32 (word[i]); } +/* Mark value as unsafely initialized in case it becomes atomic later +* and we didn't byte swap something non-byte swap neutral. +*/ +static void +nfp_map_bpf_byte_swap_record (struct nfp_bpf_map *nfp_map,void *value) +{ +u32 *word = value; +unsigned int i; + +for (i =0 ; i <DIV_ROUND_UP (nfp_map->offmap->map.value_size,4 ); i++) +if (nfp_map->use_map[i].type ==NFP_MAP_UNUSED && + word[i] != (__force u32 )cpu_to_be32 (word[i])) + nfp_map->use_map[i].non_zero_update =1 ; +} +static int nfp_bpf_map_lookup_entry (struct bpf_offloaded_map *offmap,void *key,void *value)
@@ -322,6 +337,7 @@ nfp_bpf_map_update_entry(struct bpf_offloaded_map *offmap, void *key, void *value, u64 flags) { nfp_map_bpf_byte_swap(offmap->dev_priv, value); +nfp_map_bpf_byte_swap_record (offmap->dev_priv, value);return nfp_bpf_ctrl_update_entry (offmap, key, value, flags); }
drivers/net/ethernet/netronome/nfp/bpf/verifier.c +53 -5
81 lines not on this page · raw message
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 47/237 KVM: nVMX: reset cache/shadows when switching loaded VMCS
In reply to Sasha LevinFrom: Sean Christopherson <[email protected]>
[ Upstream commit b7031fd40fcc741b0f9b0c04c8d844e445858b84 ]
Reset the vm_{entry,exit}_controls_shadow variables as well as the segment cache after loading a new VMCS in vmx_switch_vmcs(). The shadows/cache track VMCS data, i.e. they're stale every time we switch to a new VMCS regardless of reason.
This fixes a bug where stale control shadows would be consumed after a nested VMExit due to a failed consistency check.
--- arch/x86/kvm/vmx.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/x86/kvm/vmx.c +4 -4
@@ -11013,6 +11013,10 @@ static void vmx_switch_vmcs(struct kvm_vcpu *vcpu, struct loaded_vmcs *vmcs) vmx->loaded_vmcs = vmcs;vmx_vcpu_load (vcpu, cpu);put_cpu (); + +vm_entry_controls_reset_shadow (vmx); +vm_exit_controls_reset_shadow (vmx); +vmx_segment_cache_clear (vmx); }/*
@@ -12700,7 +12704,6 @@ static int enter_vmx_non_root_mode(struct kvm_vcpu *vcpu, u32 *exit_qual) vmx->nested.vmcs01_guest_bndcfgs =vmcs_read64 (GUEST_BNDCFGS );vmx_switch_vmcs (vcpu, &vmx->nested.vmcs02); -vmx_segment_cache_clear (vmx);if (vmcs12->cpu_based_vm_exec_control &CPU_BASED_USE_TSC_OFFSETING ) vcpu->arch.tsc_offset += vmcs12->tsc_offset;
@@ -13531,9 +13534,6 @@ static void nested_vmx_vmexit(struct kvm_vcpu *vcpu, u32 exit_reason, }vmx_switch_vmcs (vcpu, &vmx->vmcs01); -vm_entry_controls_reset_shadow (vmx); -vm_exit_controls_reset_shadow (vmx); -vmx_segment_cache_clear (vmx);/* Update any VMCS fields that might have changed while L2 ran */ vmcs_write32 (VM_EXIT_MSR_LOAD_COUNT , vmx->msr_autoload.host.nr);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 48/237 KVM: nVMX: move check_vmentry_postreqs() call to nested_vmx_enter_non_root_mode()
In reply to Sasha LevinFrom: Sean Christopherson <[email protected]>
[ Upstream commit 7671ce21b13b9596163a29f4712cb2451a9b97dc ]
In preparation of supporting checkpoint/restore for nested state, commit ca0bde28f2ed ("kvm: nVMX: Split VMCS checks from nested_vmx_run()") modified check_vmentry_postreqs() to only perform the guest EFER consistency checks when nested_run_pending is true. But, in the normal nested VMEntry flow, nested_run_pending is only set after check_vmentry_postreqs(), i.e. the consistency check is being skipped.
Alternatively, nested_run_pending could be set prior to calling check_vmentry_postreqs() in nested_vmx_run(), but placing the consistency checks in nested_vmx_enter_non_root_mode() allows us to split prepare_vmcs02() and interleave the preparation with the consistency checks without having to change the call sites of nested_vmx_enter_non_root_mode(). In other words, the rest of the consistency check code in nested_vmx_run() will be joining the postreqs checks in future patches.
--- arch/x86/kvm/vmx.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
arch/x86/kvm/vmx.c +3 -7
@@ -12695,6 +12695,9 @@ static int enter_vmx_non_root_mode(struct kvm_vcpu *vcpu, u32 *exit_qual)if (likely (!evaluate_pending_interrupts) &&kvm_vcpu_apicv_active (vcpu)) evaluate_pending_interrupts |=vmx_has_apicv_interrupt (vcpu); +if (from_vmentry &&check_vmentry_postreqs (vcpu, vmcs12, exit_qual)) +return EXIT_REASON_INVALID_STATE ; +enter_guest_mode (vcpu);if (!(vmcs12->vm_entry_controls &VM_ENTRY_LOAD_DEBUG_CONTROLS ))
@@ -12837,13 +12840,6 @@ static int nested_vmx_run(struct kvm_vcpu *vcpu, bool launch)*/ skip_emulated_instruction (vcpu); - ret =check_vmentry_postreqs (vcpu, vmcs12, &exit_qual); -if (ret) { -nested_vmx_entry_failure (vcpu, vmcs12, -EXIT_REASON_INVALID_STATE , exit_qual); -return 1 ; - } -/* * We're finally done with prerequisite checking, and can start with * the nested entry.
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 49/237 KVM/x86: Fix invvpid and invept register operand size in 64-bit mode
In reply to Sasha LevinFrom: Uros Bizjak <[email protected]>
[ Upstream commit 5ebb272b2ea7e02911a03a893f8d922d49f9bb4a ]
Register operand size of invvpid and invept instruction in 64-bit mode has always 64 bits. Adjust inline function argument type to reflect correct size.
--- arch/x86/kvm/vmx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kvm/vmx.c +2 -2
@@ -2079,7 +2079,7 @@ static int __find_msr_index(struct vcpu_vmx *vmx, u32 msr)return -1 ; } -static inline void __invvpid (int ext,u16 vpid,gva_t gva) +static inline void __invvpid (unsigned long ext,u16 vpid,gva_t gva) {struct {u64 vpid :16 ;
@@ -2094,7 +2094,7 @@ static inline void __invvpid(int ext, u16 vpid, gva_t gva)BUG_ON (error); } -static inline void __invept (int ext,u64 eptp,gpa_t gpa) +static inline void __invept (unsigned long ext,u64 eptp,gpa_t gpa) {struct {u64 eptp, gpa;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 50/237 clk: tegra: Fixes for MBIST work around
In reply to Sasha LevinFrom: Joseph Lo <[email protected]>
[ Upstream commit a4dbbceeee3e0ba670875a147237d6566de78840 ]
Fix some incorrect data in LVL2 offset and bit mask.
--- drivers/clk/tegra/clk-tegra210.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/clk/tegra/clk-tegra210.c +3 -3
@@ -2603,7 +2603,7 @@ static struct tegra210_domain_mbist_war tegra210_pg_mbist_war[] = { [TEGRA_POWERGATE_MPE] = { .handle_lvl2_ovr = tegra210_generic_mbist_war, .lvl2_offset = LVL2_CLK_GATE_OVRE, - .lvl2_mask = BIT(2), + .lvl2_mask = BIT(29), }, [TEGRA_POWERGATE_SOR] = { .handle_lvl2_ovr = tegra210_generic_mbist_war,
@@ -2654,14 +2654,14 @@ static struct tegra210_domain_mbist_war tegra210_pg_mbist_war[] = { .num_clks = ARRAY_SIZE(nvdec_slcg_clkids), .clk_init_data = nvdec_slcg_clkids, .handle_lvl2_ovr = tegra210_generic_mbist_war, - .lvl2_offset = LVL2_CLK_GATE_OVRC, + .lvl2_offset = LVL2_CLK_GATE_OVRE, .lvl2_mask = BIT(9) | BIT(31), }, [TEGRA_POWERGATE_NVJPG] = { .num_clks = ARRAY_SIZE(nvjpg_slcg_clkids), .clk_init_data = nvjpg_slcg_clkids, .handle_lvl2_ovr = tegra210_generic_mbist_war, - .lvl2_offset = LVL2_CLK_GATE_OVRC, + .lvl2_offset = LVL2_CLK_GATE_OVRE, .lvl2_mask = BIT(9) | BIT(31), }, [TEGRA_POWERGATE_AUD] = {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 51/237 scsi: isci: Use proper enumerated type in atapi_d2h_reg_frame_handler
In reply to Sasha LevinFrom: Nathan Chancellor <[email protected]>
[ Upstream commit e9e9a103528c7e199ead6e5374c9c52cf16b5802 ]
Clang warns when one enumerated type is implicitly converted to another.
drivers/scsi/isci/request.c:1629:13: warning: implicit conversion from enumeration type 'enum sci_io_status' to different enumeration type 'enum sci_status' [-Wenum-conversion]
status = SCI_IO_FAILURE_RESPONSE_VALID;
~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/scsi/isci/request.c:1631:12: warning: implicit conversion from
enumeration type 'enum sci_io_status' to different enumeration type
'enum sci_status' [-Wenum-conversion]
status = SCI_IO_FAILURE_RESPONSE_VALID;
~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~status is of type sci_status but SCI_IO_FAILURE_RESPONSE_VALID is of type sci_io_status. Use SCI_FAILURE_IO_RESPONSE_VALID, which is from sci_status and has SCI_IO_FAILURE_RESPONSE_VALID's exact value since that is what SCI_IO_FAILURE_RESPONSE_VALID is mapped to in the isci.h file.
--- drivers/scsi/isci/request.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/isci/request.c +2 -2
@@ -1626,9 +1626,9 @@ static enum sci_status atapi_d2h_reg_frame_handler(struct isci_request *ireq,if (status ==SCI_SUCCESS ) {if (ireq->stp.rsp.status &ATA_ERR ) - status =SCI_IO_FAILURE_RESPONSE_VALID ; + status =SCI_FAILURE_IO_RESPONSE_VALID ; }else { - status =SCI_IO_FAILURE_RESPONSE_VALID ; + status =SCI_FAILURE_IO_RESPONSE_VALID ; }if (status !=SCI_SUCCESS ) {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 52/237 scsi: isci: Change sci_controller_start_task's return type to sci_status
In reply to Sasha LevinFrom: Nathan Chancellor <[email protected]>
[ Upstream commit 362b5da3dfceada6e74ecdd7af3991bbe42c0c0f ]
Clang warns when an enumerated type is implicitly converted to another.
drivers/scsi/isci/request.c:3476:13: warning: implicit conversion from enumeration type 'enum sci_task_status' to different enumeration type 'enum sci_status' [-Wenum-conversion]
status = sci_controller_start_task(ihost,
~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~drivers/scsi/isci/host.c:2744:10: warning: implicit conversion from enumeration type 'enum sci_status' to different enumeration type 'enum sci_task_status' [-Wenum-conversion]
return SCI_SUCCESS;
~~~~~~ ^~~~~~~~~~~
drivers/scsi/isci/host.c:2753:9: warning: implicit conversion from
enumeration type 'enum sci_status' to different enumeration type 'enum
sci_task_status' [-Wenum-conversion]
return status;
~~~~~~ ^~~~~~Avoid all of these implicit conversion by just making sci_controller_start_task use sci_status. This silences Clang and has no functional change since sci_task_status has all of its values mapped to something in sci_status.
--- drivers/scsi/isci/host.c | 8 ++++---- drivers/scsi/isci/host.h | 2 +- drivers/scsi/isci/task.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-)
drivers/scsi/isci/host.c +4 -4
@@ -2717,9 +2717,9 @@ enum sci_status sci_controller_continue_io(struct isci_request *ireq)* the task management request. * @task_request: the handle to the task request object to start. */ -enum sci_task_status sci_controller_start_task (struct isci_host *ihost, -struct isci_remote_device *idev, -struct isci_request *ireq) +enum sci_status sci_controller_start_task (struct isci_host *ihost, +struct isci_remote_device *idev, +struct isci_request *ireq) {enum sci_status status;
@@ -2728,7 +2728,7 @@ enum sci_task_status sci_controller_start_task(struct isci_host *ihost,"%s: SCIC Controller starting task from invalid " "state\n" , __func__); -return SCI_TASK_FAILURE_INVALID_STATE ; +return SCI_FAILURE_INVALID_STATE ; } status =sci_remote_device_start_task (ihost, idev, ireq);
drivers/scsi/isci/host.h +1 -1
@@ -489,7 +489,7 @@ enum sci_status sci_controller_start_io(struct isci_remote_device *idev, struct isci_request *ireq); -enum sci_task_status sci_controller_start_task ( +enum sci_status sci_controller_start_task (struct isci_host *ihost,struct isci_remote_device *idev,struct isci_request *ireq);
drivers/scsi/isci/task.c +2 -2
@@ -258,7 +258,7 @@ static int isci_task_execute_tmf(struct isci_host *ihost, struct isci_tmf *tmf, unsigned long timeout_ms) {DECLARE_COMPLETION_ONSTACK (completion ); -enum sci_task_status status =SCI_TASK_FAILURE ; +enum sci_status status =SCI_FAILURE ;struct isci_request *ireq;int ret =TMF_RESP_FUNC_FAILED ;unsigned long flags;
@@ -301,7 +301,7 @@ static int isci_task_execute_tmf(struct isci_host *ihost,/* start the TMF io. */ status =sci_controller_start_task (ihost, idev, ireq); -if (status !=SCI_TASK_SUCCESS ) { +if (status !=SCI_SUCCESS ) { dev_dbg(&ihost->pdev->dev, "%s: start_io failed - status = 0x%x, request = %p\n", __func__,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 53/237 scsi: bfa: Avoid implicit enum conversion in bfad_im_post_vendor_event
In reply to Sasha LevinFrom: Nathan Chancellor <[email protected]>
[ Upstream commit 761c830ec7b3d0674b3ad89cefd77a692634e305 ]
Clang warns when one enumerated type is implicitly converted to another.
drivers/scsi/bfa/bfa_fcs_lport.c:379:26: warning: implicit conversion from enumeration type 'enum bfa_lport_aen_event' to different enumeration type 'enum bfa_ioc_aen_event' [-Wenum-conversion]
BFA_AEN_CAT_LPORT, event);
^~~~~The root cause of these warnings is the bfad_im_post_vendor_event function, which expects a value from enum bfa_ioc_aen_event but there are multiple instances of values from enums bfa_port_aen_event, bfa_audit_aen_event, and bfa_lport_aen_event being used in this function.
Given that this doesn't appear to be a problem since cat helps with differentiating the events, just change evt's type to int so that no conversion needs to happen and Clang won't warn. Update aen_type's type in bfa_aen_entry_s as members that hold enumerated types should be int.
--- drivers/scsi/bfa/bfa_defs_svc.h | 2 +- drivers/scsi/bfa/bfad_im.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/bfa/bfa_defs_svc.h +1 -1
@@ -1453,7 +1453,7 @@ union bfa_aen_data_u {struct bfa_aen_entry_s {struct list_head qe;enum bfa_aen_category aen_category; -u32 aen_type; +int aen_type;union bfa_aen_data_u aen_data;u64 aen_tv_sec;u64 aen_tv_usec;
drivers/scsi/bfa/bfad_im.h +1 -1
@@ -143,7 +143,7 @@ struct bfad_im_s {static inline void bfad_im_post_vendor_event (struct bfa_aen_entry_s *entry,struct bfad_s *drv,int cnt,enum bfa_aen_category cat, -enum bfa_ioc_aen_event evt) +int evt) {struct timespec64 ts;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 54/237 scsi: iscsi_tcp: Explicitly cast param in iscsi_sw_tcp_host_get_param
In reply to Sasha LevinFrom: Nathan Chancellor <[email protected]>
[ Upstream commit 20054597f169090109fc3f0dfa1a48583f4178a4 ]
Clang warns when one enumerated type is implicitly converted to another.
drivers/scsi/iscsi_tcp.c:803:15: warning: implicit conversion from enumeration type 'enum iscsi_host_param' to different enumeration type 'enum iscsi_param' [-Wenum-conversion]
&addr, param, buf);
^~~~~1 warning generated.
iscsi_conn_get_addr_param handles ISCSI_HOST_PARAM_IPADDRESS just fine so add an explicit cast to iscsi_param to make it clear to Clang that this is expected behavior.
--- drivers/scsi/iscsi_tcp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/scsi/iscsi_tcp.c +2 -1
@@ -800,7 +800,8 @@ static int iscsi_sw_tcp_host_get_param(struct Scsi_Host *shost,return rc;return iscsi_conn_get_addr_param ((struct sockaddr_storage *) - &addr, param, buf); + &addr, + (enum iscsi_param )param, buf);default :return iscsi_host_get_param (shost, param, buf); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 55/237 crypto: ccree - avoid implicit enum conversion
In reply to Sasha LevinFrom: Nathan Chancellor <[email protected]>
[ Upstream commit 18e732b8035d175181aae2ded127994cb01694f7 ]
Clang warns when one enumerated type is implicitly converted to another and this happens in several locations in this driver, ultimately related to the set_cipher_{mode,config0} functions. set_cipher_mode expects a mode of type drv_cipher_mode and set_cipher_config0 expects a mode of type drv_crypto_direction.
drivers/crypto/ccree/cc_ivgen.c:58:35: warning: implicit conversion from enumeration type 'enum cc_desc_direction' to different enumeration type 'enum drv_crypto_direction' [-Wenum-conversion]
set_cipher_config0(&iv_seq[idx], DESC_DIRECTION_ENCRYPT_ENCRYPT);
drivers/crypto/ccree/cc_hash.c:99:28: warning: implicit conversion from enumeration type 'enum cc_hash_conf_pad' to different enumeration type 'enum drv_crypto_direction' [-Wenum-conversion]
set_cipher_config0(desc, HASH_DIGEST_RESULT_LITTLE_ENDIAN);
drivers/crypto/ccree/cc_aead.c:1643:30: warning: implicit conversion from enumeration type 'enum drv_hash_hw_mode' to different enumeration type 'enum drv_cipher_mode' [-Wenum-conversion]
set_cipher_mode(&desc[idx], DRV_HASH_HW_GHASH);
Since this fundamentally isn't a problem because these values just represent simple integers for a shift operation, make it clear to Clang that this is okay by making the mode parameter in both functions an int.
--- drivers/crypto/ccree/cc_hw_queue_defs.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/crypto/ccree/cc_hw_queue_defs.h +2 -4
@@ -449,8 +449,7 @@ static inline void set_flow_mode(struct cc_hw_desc *pdesc,* @pdesc: pointer HW descriptor struct * @mode: Any one of the modes defined in [CC7x-DESC] */ -static inline void set_cipher_mode (struct cc_hw_desc *pdesc, -enum drv_cipher_mode mode) +static inline void set_cipher_mode (struct cc_hw_desc *pdesc,int mode) { pdesc->word[4 ] |=FIELD_PREP (WORD4_CIPHER_MODE , mode); }
@@ -461,8 +460,7 @@ static inline void set_cipher_mode(struct cc_hw_desc *pdesc,* @pdesc: pointer HW descriptor struct * @mode: Any one of the modes defined in [CC7x-DESC] */ -static inline void set_cipher_config0 (struct cc_hw_desc *pdesc, -enum drv_crypto_direction mode) +static inline void set_cipher_config0 (struct cc_hw_desc *pdesc,int mode) { pdesc->word[4 ] |=FIELD_PREP (WORD4_CIPHER_CONF0 , mode); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 56/237 nvmet: avoid integer overflow in the discard code
In reply to Sasha LevinFrom: Bart Van Assche <[email protected]>
[ Upstream commit 8eacd1bd21d6913ec27e6120e9a8733352e191d3 ]
Although I'm not sure whether it is a good idea to support large discard commands, I think integer overflow for discard ranges larger than 4 GB should be avoided. This patch avoids that smatch reports the following:
drivers/nvme/target/io-cmd-file.c:249:1 nvmet_file_execute_discard() warn: should '((range.nlb)) << req->ns->blksize_shift' be a 64 bit type?
--- drivers/nvme/target/io-cmd-file.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/nvme/target/io-cmd-file.c +2 -1
@@ -246,7 +246,8 @@ static void nvmet_file_execute_discard(struct nvmet_req *req)break ; offset =le64_to_cpu (range.slba) << req->ns->blksize_shift; - len =le32_to_cpu (range.nlb) << req->ns->blksize_shift; + len =le32_to_cpu (range.nlb); + len <<= req->ns->blksize_shift;if (offset + len > req->ns->size) { ret =NVME_SC_LBA_RANGE |NVME_SC_DNR ;break ;
Signature · 7 lines
2.20.1 _______________________________________________ Linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
Sasha Levin
maintainerPATCH 57/237 nvmet-fcloop: suppress a compiler warning
In reply to Sasha LevinFrom: Bart Van Assche <[email protected]>
[ Upstream commit 1216e9ef18b84f4fb5934792368fb01eb3540520 ]
Building with W=1 enables the compiler warning -Wimplicit-fallthrough=3. That option does not recognize the fall-through comment in the fcloop driver. Add a fall-through comment that is recognized for -Wimplicit-fallthrough=3. This patch avoids that the compiler reports the following warning when building with W=1:
drivers/nvme/target/fcloop.c:647:6: warning: this statement may fall through [-Wimplicit-fallthrough=]
if (op == NVMET_FCOP_READDATA)
^
--- drivers/nvme/target/fcloop.c | 1 + 1 file changed, 1 insertion(+)
drivers/nvme/target/fcloop.c +1 -0
@@ -648,6 +648,7 @@ fcloop_fcp_op(struct nvmet_fc_target_port *tgtport,break ;/* Fall-Thru to RSP handling */ +/* FALLTHRU */ case NVMET_FCOP_RSP :if (fcpreq) {
Signature · 7 lines
2.20.1 _______________________________________________ Linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
Sasha Levin
maintainerPATCH 58/237 nvme-pci: fix hot removal during error handling
In reply to Sasha LevinFrom: Keith Busch <[email protected]>
[ Upstream commit cb4bfda62afa25b4eee3d635d33fccdd9485dd7c ]
A removal waits for the reset_work to complete. If a surprise removal occurs around the same time as an error triggered controller reset, and reset work happened to dispatch a command to the removed controller, the command won't be recovered since the timeout work doesn't do anything during error recovery. We wouldn't want to wait for timeout handling anyway, so this patch fixes this by disabling the controller and killing admin queues prior to syncing with the reset_work.
--- drivers/nvme/host/pci.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/nvme/host/pci.c +1 -2
@@ -2583,13 +2583,12 @@ static void nvme_remove(struct pci_dev *pdev)struct nvme_dev *dev =pci_get_drvdata (pdev);nvme_change_ctrl_state (&dev->ctrl,NVME_CTRL_DELETING ); - -cancel_work_sync (&dev->ctrl.reset_work);pci_set_drvdata (pdev,NULL );if (!pci_device_is_present (pdev)) {nvme_change_ctrl_state (&dev->ctrl,NVME_CTRL_DEAD );nvme_dev_disable (dev, true); +nvme_dev_remove_admin (dev); }flush_work (&dev->ctrl.reset_work);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 59/237 PCI: mediatek: Fixup MSI enablement logic by enabling MSI before clocks
In reply to Sasha LevinFrom: Honghui Zhang <[email protected]>
[ Upstream commit 3828d60fd2ef99f97a677c1f95af2ab3e65e2576 ]
Commit 43e6409db64d ("PCI: mediatek: Add MSI support for MT2712 and MT7622") added MSI support but enabled MSI in the wrong place, at a step in the probe sequence where clocks were not still enabled.
Fix this issue by calling mtk_pcie_enable_msi() in mtk_pcie_startup_port_v2() since clocks are enabled when mtk_pcie_startup_port_v2() is called.
To avoid forward declaration of mtk_pcie_enable_msi(), move the mtk_pcie_startup_port_v2() function definition in the file.
--- drivers/pci/controller/pcie-mediatek.c | 143 +++++++++++++------------ 1 file changed, 72 insertions(+), 71 deletions(-)
drivers/pci/controller/pcie-mediatek.c +72 -71
@@ -394,75 +394,6 @@ static struct pci_ops mtk_pcie_ops_v2 = { .write = mtk_pcie_config_write, }; -static int mtk_pcie_startup_port_v2 (struct mtk_pcie_port *port) -{ -struct mtk_pcie *pcie = port->pcie; -struct resource *mem = &pcie->mem; -const struct mtk_pcie_soc *soc = port->pcie->soc; -u32 val; -size_t size; -int err; - -/* MT7622 platforms need to enable LTSSM and ASPM from PCIe subsys */ -if (pcie->base) { - val =readl (pcie->base +PCIE_SYS_CFG_V2 ); - val |=PCIE_CSR_LTSSM_EN (port->slot) | -PCIE_CSR_ASPM_L1_EN (port->slot); -writel (val, pcie->base +PCIE_SYS_CFG_V2 ); - } - -/* Assert all reset signals */ -writel (0 , port->base +PCIE_RST_CTRL ); - -/* -* Enable PCIe link down reset, if link status changed from link up to -* link down, this will reset MAC control registers and configuration -* space. -*/ -writel (PCIE_LINKDOWN_RST_EN , port->base +PCIE_RST_CTRL ); - -/* De-assert PHY, PE, PIPE, MAC and configuration reset */ - val =readl (port->base +PCIE_RST_CTRL ); - val |=PCIE_PHY_RSTB |PCIE_PERSTB |PCIE_PIPE_SRSTB | -PCIE_MAC_SRSTB |PCIE_CRSTB ; -writel (val, port->base +PCIE_RST_CTRL ); - -/* Set up vendor ID and class code */ -if (soc->need_fix_class_id) { - val =PCI_VENDOR_ID_MEDIATEK ; -writew (val, port->base +PCIE_CONF_VEND_ID ); - - val =PCI_CLASS_BRIDGE_PCI ; -writew (val, port->base +PCIE_CONF_CLASS_ID ); - } - -/* 100ms timeout value should be enough for Gen1/2 training */ - err =readl_poll_timeout (port->base +PCIE_LINK_STATUS_V2 , val, - !!(val &PCIE_PORT_LINKUP_V2 ),20 , -100 *USEC_PER_MSEC ); -if (err) -return -ETIMEDOUT ; - -/* Set INTx mask */ - val =readl (port->base +PCIE_INT_MASK ); - val &= ~INTX_MASK ; -writel (val, port->base +PCIE_INT_MASK ); - -/* Set AHB to PCIe translation windows */ - size = mem->end - mem->start; - val =lower_32_bits (mem->start) |AHB2PCIE_SIZE (fls (size)); -writel (val, port->base +PCIE_AHB_TRANS_BASE0_L ); - - val =upper_32_bits (mem->start); -writel (val, port->base +PCIE_AHB_TRANS_BASE0_H ); - -/* Set PCIe to AXI translation memory space.*/ - val =fls (0xffffffff ) |WIN_ENABLE ; -writel (val, port->base +PCIE_AXI_WINDOW0 ); - -return 0 ; -} -static void mtk_compose_msi_msg (struct irq_data *data,struct msi_msg *msg) {struct mtk_pcie_port *port =irq_data_get_irq_chip_data (data);
@@ -639,8 +570,6 @@ static int mtk_pcie_init_irq_domain(struct mtk_pcie_port *port, ret =mtk_pcie_allocate_msi_domains (port);if (ret)return ret; - -mtk_pcie_enable_msi (port); }return 0 ;
@@ -707,6 +636,78 @@ static int mtk_pcie_setup_irq(struct mtk_pcie_port *port,return 0 ; } +static int mtk_pcie_startup_port_v2 (struct mtk_pcie_port *port) +{ +struct mtk_pcie *pcie = port->pcie; +struct resource *mem = &pcie->mem; +const struct mtk_pcie_soc *soc = port->pcie->soc; +u32 val; +size_t size; +int err; + +/* MT7622 platforms need to enable LTSSM and ASPM from PCIe subsys */ +if (pcie->base) { + val =readl (pcie->base +PCIE_SYS_CFG_V2 ); + val |=PCIE_CSR_LTSSM_EN (port->slot) | +PCIE_CSR_ASPM_L1_EN (port->slot); +writel (val, pcie->base +PCIE_SYS_CFG_V2 ); + } + +/* Assert all reset signals */ +writel (0 , port->base +PCIE_RST_CTRL ); + +/* +* Enable PCIe link down reset, if link status changed from link up to +* link down, this will reset MAC control registers and configuration +* space. +*/ +writel (PCIE_LINKDOWN_RST_EN , port->base +PCIE_RST_CTRL ); + +/* De-assert PHY, PE, PIPE, MAC and configuration reset */ + val =readl (port->base +PCIE_RST_CTRL ); + val |=PCIE_PHY_RSTB |PCIE_PERSTB |PCIE_PIPE_SRSTB | +PCIE_MAC_SRSTB |PCIE_CRSTB ; +writel (val, port->base +PCIE_RST_CTRL ); + +/* Set up vendor ID and class code */ +if (soc->need_fix_class_id) { + val =PCI_VENDOR_ID_MEDIATEK ; +writew (val, port->base +PCIE_CONF_VEND_ID ); + + val =PCI_CLASS_BRIDGE_PCI ; +writew (val, port->base +PCIE_CONF_CLASS_ID ); + } + +/* 100ms timeout value should be enough for Gen1/2 training */ + err =readl_poll_timeout (port->base +PCIE_LINK_STATUS_V2 , val, + !!(val &PCIE_PORT_LINKUP_V2 ),20 , +100 *USEC_PER_MSEC ); +if (err) +return -ETIMEDOUT ; + +/* Set INTx mask */ + val =readl (port->base +PCIE_INT_MASK ); + val &= ~INTX_MASK ; +writel (val, port->base +PCIE_INT_MASK ); + +if (IS_ENABLED (CONFIG_PCI_MSI )) +mtk_pcie_enable_msi (port); + +/* Set AHB to PCIe translation windows */ + size = mem->end - mem->start; + val =lower_32_bits (mem->start) |AHB2PCIE_SIZE (fls (size)); +writel (val, port->base +PCIE_AHB_TRANS_BASE0_L ); + + val =upper_32_bits (mem->start); +writel (val, port->base +PCIE_AHB_TRANS_BASE0_H ); + +/* Set PCIe to AXI translation memory space.*/ + val =fls (0xffffffff ) |WIN_ENABLE ; +writel (val, port->base +PCIE_AXI_WINDOW0 ); + +return 0 ; +} +static void __iomem *mtk_pcie_map_bus (struct pci_bus *bus,unsigned int devfn,int where) {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 60/237 clk: mmp2: fix the clock id for sdh2_clk and sdh3_clk
In reply to Sasha LevinFrom: Lubomir Rintel <[email protected]>
[ Upstream commit 4917fb90eec7c26dac1497ada3bd4a325f670fcc ]
A typo that makes it impossible to get the correct clocks for MMP2_CLK_SDH2 and MMP2_CLK_SDH3.
--- drivers/clk/mmp/clk-of-mmp2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/clk/mmp/clk-of-mmp2.c +2 -2
@@ -227,8 +227,8 @@ static struct mmp_param_gate_clk apmu_gate_clks[] = {/* The gate clocks has mux parent. */ {MMP2_CLK_SDH0, "sdh0_clk", "sdh_mix_clk", CLK_SET_RATE_PARENT, APMU_SDH0, 0x1b, 0x1b, 0x0, 0, &sdh_lock}, {MMP2_CLK_SDH1, "sdh1_clk", "sdh_mix_clk", CLK_SET_RATE_PARENT, APMU_SDH1, 0x1b, 0x1b, 0x0, 0, &sdh_lock}, - {MMP2_CLK_SDH1, "sdh2_clk", "sdh_mix_clk", CLK_SET_RATE_PARENT, APMU_SDH2, 0x1b, 0x1b, 0x0, 0, &sdh_lock}, - {MMP2_CLK_SDH1, "sdh3_clk", "sdh_mix_clk", CLK_SET_RATE_PARENT, APMU_SDH3, 0x1b, 0x1b, 0x0, 0, &sdh_lock}, + {MMP2_CLK_SDH2, "sdh2_clk", "sdh_mix_clk", CLK_SET_RATE_PARENT, APMU_SDH2, 0x1b, 0x1b, 0x0, 0, &sdh_lock}, + {MMP2_CLK_SDH3, "sdh3_clk", "sdh_mix_clk", CLK_SET_RATE_PARENT, APMU_SDH3, 0x1b, 0x1b, 0x0, 0, &sdh_lock}, {MMP2_CLK_DISP0, "disp0_clk", "disp0_div", CLK_SET_RATE_PARENT, APMU_DISP0, 0x1b, 0x1b, 0x0, 0, &disp0_lock}, {MMP2_CLK_DISP0_SPHY, "disp0_sphy_clk", "disp0_sphy_div", CLK_SET_RATE_PARENT, APMU_DISP0, 0x1024, 0x1024, 0x0, 0, &disp0_lock}, {MMP2_CLK_DISP1, "disp1_clk", "disp1_div", CLK_SET_RATE_PARENT, APMU_DISP1, 0x1b, 0x1b, 0x0, 0, &disp1_lock},
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 61/237 clk: at91: audio-pll: fix audio pmc type
In reply to Sasha LevinFrom: Alexandre Belloni <[email protected]>
[ Upstream commit 7fa75007b7d7421aea59ff2b12ab1bd65a5abfa6 ]
The allocation for the audio pmc is using the size of struct clk_audio_pad instead of struct clk_audio_pmc. This works fine because the former is larger than the latter but it is safer to be correct.
--- drivers/clk/at91/clk-audio-pll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/at91/clk-audio-pll.c +1 -1
@@ -509,7 +509,7 @@ static void __init of_sama5d2_clk_audio_pll_pad_setup(struct device_node *np)static void __init of_sama5d2_clk_audio_pll_pmc_setup (struct device_node *np) { -struct clk_audio_pad *apmc_ck; +struct clk_audio_pmc *apmc_ck;struct clk_init_data init = {}; apmc_ck =kzalloc (sizeof (*apmc_ck),GFP_KERNEL );
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 62/237 ASoC: tegra_sgtl5000: fix device_node refcounting
In reply to Sasha LevinFrom: Marcel Ziswiler <[email protected]>
[ Upstream commit a85227da2dcc291b762c8482a505bc7d0d2d4b07 ]
Similar to the following:
commit 4321723648b0 ("ASoC: tegra_alc5632: fix device_node refcounting")
commit 7c5dfd549617 ("ASoC: tegra: fix device_node refcounting")
--- sound/soc/tegra/tegra_sgtl5000.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
sound/soc/tegra/tegra_sgtl5000.c +15 -2
@@ -149,14 +149,14 @@ static int tegra_sgtl5000_driver_probe(struct platform_device *pdev)dev_err (&pdev->dev,"Property 'nvidia,i2s-controller' missing/invalid\n" ); ret = -EINVAL ; - goto err; + goto err_put_codec_of_node; } tegra_sgtl5000_dai.platform_of_node = tegra_sgtl5000_dai.cpu_of_node; ret =tegra_asoc_utils_init (&machine->util_data, &pdev->dev);if (ret) - goto err; + goto err_put_cpu_of_node; ret =snd_soc_register_card (card);if (ret) {
@@ -169,6 +169,13 @@ static int tegra_sgtl5000_driver_probe(struct platform_device *pdev) err_fini_utils:tegra_asoc_utils_fini (&machine->util_data); +err_put_cpu_of_node: +of_node_put (tegra_sgtl5000_dai.cpu_of_node); + tegra_sgtl5000_dai.cpu_of_node =NULL ; + tegra_sgtl5000_dai.platform_of_node =NULL ; +err_put_codec_of_node: +of_node_put (tegra_sgtl5000_dai.codec_of_node); + tegra_sgtl5000_dai.codec_of_node =NULL ; err:return ret; }
@@ -183,6 +190,12 @@ static int tegra_sgtl5000_driver_remove(struct platform_device *pdev)tegra_asoc_utils_fini (&machine->util_data); +of_node_put (tegra_sgtl5000_dai.cpu_of_node); + tegra_sgtl5000_dai.cpu_of_node =NULL ; + tegra_sgtl5000_dai.platform_of_node =NULL ; +of_node_put (tegra_sgtl5000_dai.codec_of_node); + tegra_sgtl5000_dai.codec_of_node =NULL ; +return ret; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 63/237 scsi: dc395x: fix dma API usage in srb_done
In reply to Sasha LevinFrom: Christoph Hellwig <[email protected]>
[ Upstream commit 3a5bd7021184dec2946f2a4d7a8943f8a5713e52 ]
We can't just transfer ownership to the CPU and then unmap, as this will break with swiotlb.
Instead unmap the command and sense buffer a little earlier in the I/O completion handler and get rid of the pci_dma_sync_sg_for_cpu call entirely.
--- drivers/scsi/dc395x.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/scsi/dc395x.c +2 -5
@@ -3447,14 +3447,12 @@ static void srb_done(struct AdapterCtlBlk *acb, struct DeviceCtlBlk *dcb, } } -if (dir !=PCI_DMA_NONE &&scsi_sg_count (cmd)) -pci_dma_sync_sg_for_cpu (acb->dev,scsi_sglist (cmd), -scsi_sg_count (cmd), dir); - ckc_only =0 ;/* Check Error Conditions */ ckc_e: +pci_unmap_srb (acb, srb); +if (cmd->cmnd[0 ] ==INQUIRY ) {unsigned char *base =NULL ;struct ScsiInqData *ptr;
@@ -3507,7 +3505,6 @@ static void srb_done(struct AdapterCtlBlk *acb, struct DeviceCtlBlk *dcb, cmd, cmd->result);srb_free_insert (acb, srb); } -pci_unmap_srb (acb, srb); cmd->scsi_done (cmd);waiting_process_next (acb);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 64/237 scsi: dc395x: fix DMA API usage in sg_update_list
In reply to Sasha LevinFrom: Christoph Hellwig <[email protected]>
[ Upstream commit 6c404a68bf83b4135a8a9aa1c388ebdf98e8ba7f ]
We need to transfer device ownership to the CPU before we can manipulate the mapped data.
--- drivers/scsi/dc395x.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/scsi/dc395x.c +5 -0
@@ -1969,6 +1969,11 @@ static void sg_update_list(struct ScsiReqBlk *srb, u32 left) xferred -= psge->length; }else {/* Partial SG entry done */ +pci_dma_sync_single_for_cpu (srb->dcb-> + acb->dev, + srb->sg_bus_addr, +SEGMENTX_LEN , +PCI_DMA_TODEVICE ); psge->length -= xferred; psge->address += xferred; srb->sg_index = idx;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 65/237 scsi: zorro_esp: Limit DMA transfers to 65535 bytes
In reply to Sasha LevinFrom: Finn Thain <[email protected]>
[ Upstream commit b7ded0e8b0d11b6df1c4e5aa23a26e6629c21985 ]
The core driver, esp_scsi, does not use the ESP_CONFIG2_FENAB bit, so the chip's Transfer Counter register is only 16 bits wide (not 24). A larger transfer cannot work and will theoretically result in a failed command and a "DMA length is zero" error.
--- drivers/scsi/zorro_esp.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
drivers/scsi/zorro_esp.c +1 -7
@@ -245,7 +245,7 @@ static int fastlane_esp_irq_pending(struct esp *esp)static u32 zorro_esp_dma_length_limit (struct esp *esp,u32 dma_addr,u32 dma_len) { -return dma_len >0xFFFFFF ?0xFFFFFF : dma_len; +return dma_len >0xFFFF ?0xFFFF : dma_len; }static void zorro_esp_reset_dma (struct esp *esp)
@@ -484,7 +484,6 @@ static void zorro_esp_send_blz1230_dma_cmd(struct esp *esp, u32 addr,scsi_esp_cmd (esp,ESP_CMD_DMA );zorro_esp_write8 (esp, (esp_count >>0 ) &0xff ,ESP_TCLOW );zorro_esp_write8 (esp, (esp_count >>8 ) &0xff ,ESP_TCMED ); -zorro_esp_write8 (esp, (esp_count >>16 ) &0xff ,ESP_TCHI );scsi_esp_cmd (esp, cmd); }
@@ -529,7 +528,6 @@ static void zorro_esp_send_blz1230II_dma_cmd(struct esp *esp, u32 addr,scsi_esp_cmd (esp,ESP_CMD_DMA );zorro_esp_write8 (esp, (esp_count >>0 ) &0xff ,ESP_TCLOW );zorro_esp_write8 (esp, (esp_count >>8 ) &0xff ,ESP_TCMED ); -zorro_esp_write8 (esp, (esp_count >>16 ) &0xff ,ESP_TCHI );scsi_esp_cmd (esp, cmd); }
@@ -574,7 +572,6 @@ static void zorro_esp_send_blz2060_dma_cmd(struct esp *esp, u32 addr,scsi_esp_cmd (esp,ESP_CMD_DMA );zorro_esp_write8 (esp, (esp_count >>0 ) &0xff ,ESP_TCLOW );zorro_esp_write8 (esp, (esp_count >>8 ) &0xff ,ESP_TCMED ); -zorro_esp_write8 (esp, (esp_count >>16 ) &0xff ,ESP_TCHI );scsi_esp_cmd (esp, cmd); }
@@ -599,7 +596,6 @@ static void zorro_esp_send_cyber_dma_cmd(struct esp *esp, u32 addr,zorro_esp_write8 (esp, (esp_count >>0 ) &0xff ,ESP_TCLOW );zorro_esp_write8 (esp, (esp_count >>8 ) &0xff ,ESP_TCMED ); -zorro_esp_write8 (esp, (esp_count >>16 ) &0xff ,ESP_TCHI );if (write) {/* DMA receive */
@@ -649,7 +645,6 @@ static void zorro_esp_send_cyberII_dma_cmd(struct esp *esp, u32 addr,zorro_esp_write8 (esp, (esp_count >>0 ) &0xff ,ESP_TCLOW );zorro_esp_write8 (esp, (esp_count >>8 ) &0xff ,ESP_TCMED ); -zorro_esp_write8 (esp, (esp_count >>16 ) &0xff ,ESP_TCHI );if (write) {/* DMA receive */
@@ -691,7 +686,6 @@ static void zorro_esp_send_fastlane_dma_cmd(struct esp *esp, u32 addr,zorro_esp_write8 (esp, (esp_count >>0 ) &0xff ,ESP_TCLOW );zorro_esp_write8 (esp, (esp_count >>8 ) &0xff ,ESP_TCMED ); -zorro_esp_write8 (esp, (esp_count >>16 ) &0xff ,ESP_TCHI );if (write) {/* DMA receive */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 66/237 net: dsa: mv88e6xxx: Fix 88E6141/6341 2500mbps SERDES speed
In reply to Sasha LevinFrom: Marek Behún <[email protected]>
[ Upstream commit 26422340da467538cd65eaa9c65538039ee99c8c ]
This is a fix for the port_set_speed method for the Topaz family. Currently the same method is used as for the Peridot family, but this is wrong for the SERDES port.
On Topaz, the SERDES port is port 5, not 9 and 10 as in Peridot. Moreover setting alt_bit on Topaz only makes sense for port 0 (for (differentiating 100mbps vs 200mbps). The SERDES port does not support more than 2500mbps, so alt_bit does not make any difference.
--- drivers/net/dsa/mv88e6xxx/chip.c | 4 ++-- drivers/net/dsa/mv88e6xxx/port.c | 25 +++++++++++++++++++++++-- drivers/net/dsa/mv88e6xxx/port.h | 1 + 3 files changed, 26 insertions(+), 4 deletions(-)
drivers/net/dsa/mv88e6xxx/chip.c +2 -2
@@ -3028,7 +3028,7 @@ static const struct mv88e6xxx_ops mv88e6141_ops = { .port_set_link = mv88e6xxx_port_set_link, .port_set_duplex = mv88e6xxx_port_set_duplex, .port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay, - .port_set_speed = mv88e6390_port_set_speed, + .port_set_speed = mv88e6341_port_set_speed, .port_tag_remap = mv88e6095_port_tag_remap, .port_set_frame_mode = mv88e6351_port_set_frame_mode, .port_set_egress_floods = mv88e6352_port_set_egress_floods,
@@ -3649,7 +3649,7 @@ static const struct mv88e6xxx_ops mv88e6341_ops = { .port_set_link = mv88e6xxx_port_set_link, .port_set_duplex = mv88e6xxx_port_set_duplex, .port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay, - .port_set_speed = mv88e6390_port_set_speed, + .port_set_speed = mv88e6341_port_set_speed, .port_tag_remap = mv88e6095_port_tag_remap, .port_set_frame_mode = mv88e6351_port_set_frame_mode, .port_set_egress_floods = mv88e6352_port_set_egress_floods,
drivers/net/dsa/mv88e6xxx/port.c +23 -2
@@ -228,8 +228,11 @@ static int mv88e6xxx_port_set_speed(struct mv88e6xxx_chip *chip, int port, ctrl =MV88E6XXX_PORT_MAC_CTL_SPEED_1000 ;break ;case 2500 : - ctrl =MV88E6390_PORT_MAC_CTL_SPEED_10000 | -MV88E6390_PORT_MAC_CTL_ALTSPEED ; +if (alt_bit) + ctrl =MV88E6390_PORT_MAC_CTL_SPEED_10000 | +MV88E6390_PORT_MAC_CTL_ALTSPEED ; +else + ctrl =MV88E6390_PORT_MAC_CTL_SPEED_10000 ;break ;case 10000 :/* all bits set, fall through... */
@@ -291,6 +294,24 @@ int mv88e6185_port_set_speed(struct mv88e6xxx_chip *chip, int port, int speed)return mv88e6xxx_port_set_speed (chip, port, speed, false, false); } +/* Support 10, 100, 200, 1000, 2500 Mbps (e.g. 88E6341) */ +int mv88e6341_port_set_speed (struct mv88e6xxx_chip *chip,int port,int speed) +{ +if (speed ==SPEED_MAX ) + speed = port <5 ?1000 :2500 ; + +if (speed >2500 ) +return -EOPNOTSUPP ; + +if (speed ==200 && port !=0 ) +return -EOPNOTSUPP ; + +if (speed ==2500 && port <5 ) +return -EOPNOTSUPP ; + +return mv88e6xxx_port_set_speed (chip, port, speed, !port, true); +} +/* Support 10, 100, 200, 1000 Mbps (e.g. 88E6352 family) */ int mv88e6352_port_set_speed (struct mv88e6xxx_chip *chip,int port,int speed) {
drivers/net/dsa/mv88e6xxx/port.h +1 -0
@@ -280,6 +280,7 @@ int mv88e6xxx_port_set_duplex(struct mv88e6xxx_chip *chip, int port, int dup);int mv88e6065_port_set_speed (struct mv88e6xxx_chip *chip,int port,int speed);int mv88e6185_port_set_speed (struct mv88e6xxx_chip *chip,int port,int speed); +int mv88e6341_port_set_speed (struct mv88e6xxx_chip *chip,int port,int speed);int mv88e6352_port_set_speed (struct mv88e6xxx_chip *chip,int port,int speed);int mv88e6390_port_set_speed (struct mv88e6xxx_chip *chip,int port,int speed);int mv88e6390x_port_set_speed (struct mv88e6xxx_chip *chip,int port,int speed);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 67/237 net: fix warning in af_unix
In reply to Sasha LevinFrom: Kyeongdon Kim <[email protected]>
[ Upstream commit 33c4368ee2589c165aebd8d388cbd91e9adb9688 ]
This fixes the "'hash' may be used uninitialized in this function"
net/unix/af_unix.c:1041:20: warning: 'hash' may be used uninitialized in this function [-Wmaybe-uninitialized]
addr->hash = hash ^ sk->sk_type;
--- net/unix/af_unix.c | 2 ++ 1 file changed, 2 insertions(+)
net/unix/af_unix.c +2 -0
@@ -225,6 +225,8 @@ static inline void unix_release_addr(struct unix_address *addr)static int unix_mkname (struct sockaddr_un *sunaddr,int len,unsigned int *hashp) { + *hashp =0 ; +if (len <=sizeof (short ) || len >sizeof (*sunaddr))return -EINVAL ;if (!sunaddr || sunaddr->sun_family !=AF_UNIX )
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 68/237 net: ena: Fix Kconfig dependency on X86
In reply to Sasha LevinFrom: Netanel Belgazal <[email protected]>
[ Upstream commit 8c590f9776386b8f697fd0b7ed6142ae6e3de79e ]
The Kconfig limitation of X86 is to too wide. The ENA driver only requires a little endian dependency.
Change the dependency to be on little endian CPU.
--- drivers/net/ethernet/amazon/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/amazon/Kconfig +1 -1
@@ -17,7 +17,7 @@ if NET_VENDOR_AMAZON config ENA_ETHERNET tristate "Elastic Network Adapter (ENA) support" - depends on (PCI_MSI && X86) + depends on PCI_MSI && !CPU_BIG_ENDIAN ---help--- This driver supports Elastic Network Adapter (ENA)"
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 69/237 xfs: fix use-after-free race in xfs_buf_rele
In reply to Sasha LevinFrom: Dave Chinner <[email protected]>
[ Upstream commit 37fd1678245f7a5898c1b05128bc481fb403c290 ]
When looking at a 4.18 based KASAN use after free report, I noticed that racing xfs_buf_rele() may race on dropping the last reference to the buffer and taking the buffer lock. This was the symptom displayed by the KASAN report, but the actual issue that was reported had already been fixed in 4.19-rc1 by commit e339dd8d8b04 ("xfs: use sync buffer I/O for sync delwri queue submission").
Despite this, I think there is still an issue with xfs_buf_rele() in this code:
release = atomic_dec_and_lock(&bp->b_hold, &pag->pag_buf_lock);
spin_lock(&bp->b_lock);
if (!release) {.....
If two threads race on the b_lock after both dropping a reference and one getting dropping the last reference so release = true, we end up with:
CPU 0 CPU 1atomic_dec_and_lock()
atomic_dec_and_lock() spin_lock(&bp->b_lock) spin_lock(&bp->b_lock) <spins> <release = true bp->b_lru_ref = 0> <remove from lists> freebuf = true spin_unlock(&bp->b_lock) xfs_buf_free(bp)
<gets lock, reading and writing freed memory> <accesses freed memory> spin_unlock(&bp->b_lock) <reads/writes freed memory>
IOWs, we can't safely take bp->b_lock after dropping the hold reference because the buffer may go away at any time after we drop that reference. However, this can be fixed simply by taking the bp->b_lock before we drop the reference.
It is safe to nest the pag_buf_lock inside bp->b_lock as the pag_buf_lock is only used to serialise against lookup in xfs_buf_find() and no other locks are held over or under the pag_buf_lock there. Make this clear by documenting the buffer lock orders at the top of the file.
--- fs/xfs/xfs_buf.c | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-)
fs/xfs/xfs_buf.c +37 -1
@@ -37,6 +37,32 @@ static kmem_zone_t *xfs_buf_zone;#define xb_to_gfp (flags) \ ((((flags) & XBF_READ_AHEAD) ? __GFP_NORETRY : GFP_NOFS) | __GFP_NOWARN) +/* +* Locking orders +* +* xfs_buf_ioacct_inc: +* xfs_buf_ioacct_dec: +* b_sema (caller holds) +* b_lock +* +* xfs_buf_stale: +* b_sema (caller holds) +* b_lock +* lru_lock +* +* xfs_buf_rele: +* b_lock +* pag_buf_lock +* lru_lock +* +* xfs_buftarg_wait_rele +* lru_lock +* b_lock (trylock due to inversion) +* +* xfs_buftarg_isolate +* lru_lock +* b_lock (trylock due to inversion) +*/ static inline int xfs_buf_is_vmapped(
@@ -1006,8 +1032,18 @@ xfs_buf_rele(ASSERT (atomic_read (&bp->b_hold) >0 ); - release =atomic_dec_and_lock (&bp->b_hold, &pag->pag_buf_lock); +/* +* We grab the b_lock here first to serialise racing xfs_buf_rele() +* calls. The pag_buf_lock being taken on the last reference only +* serialises against racing lookups in xfs_buf_find(). IOWs, the second +* to last reference we drop here is not serialised against the last +* reference until we take bp->b_lock. Hence if we don't grab b_lock +* first, the last "release" reference can win the race to the lock and +* free the buffer before the second-to-last reference is processed, +* leading to a use-after-free scenario. +*/ spin_lock (&bp->b_lock); + release =atomic_dec_and_lock (&bp->b_hold, &pag->pag_buf_lock);if (!release) {/* * Drop the in-flight state if the buffer is already on the LRU
Signature · 1 line
2.20.1
Re: [PATCH AUTOSEL 4.19 069/237] xfs: fix use-after-free race in xfs_buf_rele
[cc [email protected]]
Hi Sasha,
Any reason these these autosel patches are not being cc'd to the XFS list for XFS maintainer visibility and review?
Cheers,
Dave.
Quoted 120 lines · Sasha Levin
From: Dave Chinner <[email protected]>
[ Upstream commit
37fd1678245f7a5898c1b05128bc481fb403c290]When looking at a 4.18 based KASAN use after free report, I noticed that racing
xfs_buf_rele()may race on dropping the last reference to the buffer and taking the buffer lock. This was the symptom displayed by the KASAN report, but the actual issue that was reported had already been fixed in 4.19-rc1 by commite339dd8d8b04("xfs: use sync buffer I/O for sync delwri queue submission").Despite this, I think there is still an issue with
xfs_buf_rele()in this code:release = atomic_dec_and_lock(&bp->b_hold, &pag->pag_buf_lock); spin_lock(&bp->b_lock); if (!release) {.....
If two threads race on the
b_lockafter both dropping a reference and one getting dropping the last reference so release = true, we end up with:CPU 0 CPU 1
atomic_dec_and_lock()atomic_dec_and_lock() spin_lock(&bp->b_lock) spin_lock(&bp->b_lock) <spins> <release = true bp->b_lru_ref = 0> <remove from lists> freebuf = true spin_unlock(&bp->b_lock) xfs_buf_free(bp)<gets lock, reading and writing freed memory> <accesses freed memory>
spin_unlock(&bp->b_lock)<reads/writes freed memory>IOWs, we can't safely take
bp->b_lockafter dropping the hold reference because the buffer may go away at any time after we drop that reference. However, this can be fixed simply by taking thebp->b_lockbefore we drop the reference.It is safe to nest the
pag_buf_lockinsidebp->b_lockas thepag_buf_lockis only used to serialise against lookup inxfs_buf_find()and no other locks are held over or under thepag_buf_lockthere. Make this clear by documenting the buffer lock orders at the top of the file.Signed-off-by Dave Chinner <[email protected]>Reviewed-by Brian Foster <[email protected]>Reviewed-by Carlos Maiolino <[email protected]Signed-off-by Dave Chinner <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- fs/xfs/xfs_buf.c | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-)fs/xfs/xfs_buf.c +37
-1@@ -37,6 +37,32 @@ static kmem_zone_t *xfs_buf_zone;#define xb_to_gfp (flags) \ ((((flags) & XBF_READ_AHEAD) ? __GFP_NORETRY : GFP_NOFS) | __GFP_NOWARN) +/* +* Locking orders +* +* xfs_buf_ioacct_inc: +* xfs_buf_ioacct_dec: +* b_sema (caller holds) +* b_lock +* +* xfs_buf_stale: +* b_sema (caller holds) +* b_lock +* lru_lock +* +* xfs_buf_rele: +* b_lock +* pag_buf_lock +* lru_lock +* +* xfs_buftarg_wait_rele +* lru_lock +* b_lock (trylock due to inversion) +* +* xfs_buftarg_isolate +* lru_lock +* b_lock (trylock due to inversion) +*/ static inline int xfs_buf_is_vmapped(@@ -1006,8 +1032,18 @@ xfs_buf_rele(ASSERT (atomic_read (&bp->b_hold) >0 ); - release =atomic_dec_and_lock (&bp->b_hold, &pag->pag_buf_lock); +/* +* We grab the b_lock here first to serialise racing xfs_buf_rele() +* calls. The pag_buf_lock being taken on the last reference only +* serialises against racing lookups in xfs_buf_find(). IOWs, the second +* to last reference we drop here is not serialised against the last +* reference until we take bp->b_lock. Hence if we don't grab b_lock +* first, the last "release" reference can win the race to the lock and +* free the buffer before the second-to-last reference is processed, +* leading to a use-after-free scenario. +*/ spin_lock (&bp->b_lock); + release =atomic_dec_and_lock (&bp->b_hold, &pag->pag_buf_lock);if (!release) {/* * Drop the in-flight state if the buffer is already on the LRU Signature · 1 line
2.20.1
Signature · 2 lines
Dave Chinner [email protected]
Sasha Levin
maintainerRe: [PATCH AUTOSEL 4.19 069/237] xfs: fix use-after-free race in xfs_buf_rele
Quoted 6 lines · Dave Chinner
[cc [email protected]]
Hi Sasha,
Any reason these these autosel patches are not being cc'd to the XFS list for XFS maintainer visibility and review?
Interesting! It looks like the XFS entry in MAINTAINERS has duplicate entries for the mailing list, once with the M: tag and once with the L:
tag, so when I run get_maintainer.pl I see:
$ scripts/get_maintainer.pl -f fs/xfs/ "Darrick J. Wong" <[email protected]> (supporter:XFS FILESYSTEM) [email protected] (supporter:XFS FILESYSTEM) [email protected] (open list)
Which doesn't list an "open list" besides LKML.
I've fixed up my scripts to address that, sorry for missing it.
Signature · 2 lines
Thanks, Sasha
Sasha Levin
maintainerPATCH 70/237 xfs: clear ail delwri queued bufs on unmount of shutdown fs
In reply to Sasha LevinFrom: Brian Foster <[email protected]>
[ Upstream commit efc3289cf8d39c34502a7cc9695ca2fa125aad0c ]
In the typical unmount case, the AIL is forced out by the unmount sequence before the xfsaild task is stopped. Since AIL items are removed on writeback completion, this means that the AIL ->ail_buf_list delwri queue has been drained. This is not always true in the shutdown case, however.
It's possible for buffers to sit on a delwri queue for a period of time across submission attempts if said items are locked or have been relogged and pinned since first added to the queue. If the attempt to log such an item results in a log I/O error, the error processing can shutdown the fs, remove the item from the AIL, stale the buffer (dropping the LRU reference) and clear its delwri queue state. The latter bit means the buffer will be released from a delwri queue on the next submission attempt, but this might never occur if the filesystem has shutdown and the AIL is empty.
This means that such buffers are held indefinitely by the AIL delwri queue across destruction of the AIL. Aside from being a memory leak, these buffers can also hold references to in-core perag structures. The latter problem manifests as a generic/475 failure, reproducing the following asserts at unmount time:
XFS: Assertion failed: atomic_read(&pag->pag_ref) == 0,
file: fs/xfs/xfs_mount.c, line: 151 XFS: Assertion failed: atomic_read(&pag->pag_ref) == 0, file: fs/xfs/xfs_mount.c, line: 132
To prevent this problem, clear the AIL delwri queue as a final step before xfsaild() exit. The !empty state should never occur in the normal case, so add an assert to catch unexpected problems going forward.
[dgc: add comment explaining need for xfs_buf_delwri_cancel() after
calling xfs_buf_delwri_submit_nowait().]
--- fs/xfs/xfs_buf.c | 7 +++++++ fs/xfs/xfs_trans_ail.c | 28 ++++++++++++++++++++++------ 2 files changed, 29 insertions(+), 6 deletions(-)
fs/xfs/xfs_buf.c +7 -0
@@ -2025,6 +2025,13 @@ xfs_buf_delwri_submit_buffers(* is only safely useable for callers that can track I/O completion by higher * level means, e.g. AIL pushing as the @buffer_list is consumed in this * function. +* +* Note: this function will skip buffers it would block on, and in doing so +* leaves them on @buffer_list so they can be retried on a later pass. As such, +* it is up to the caller to ensure that the buffer list is fully submitted or +* cancelled appropriately when they are finished with the list. Failure to +* cancel or resubmit the list until it is empty will result in leaked buffers +* at unmount time. */ int xfs_buf_delwri_submit_nowait(
fs/xfs/xfs_trans_ail.c +22 -6
@@ -531,17 +531,33 @@ xfsaild(set_current_state (TASK_INTERRUPTIBLE );/* -* Check kthread_should_stop() after we set the task state -* to guarantee that we either see the stop bit and exit or -* the task state is reset to runnable such that it's not -* scheduled out indefinitely and detects the stop bit at -* next iteration. -* +* Check kthread_should_stop() after we set the task state to +* guarantee that we either see the stop bit and exit or the +* task state is reset to runnable such that it's not scheduled +* out indefinitely and detects the stop bit at next iteration. * A memory barrier is included in above task state set to * serialize again kthread_stop(). */ if (kthread_should_stop ()) {__set_current_state (TASK_RUNNING ); + +/* +* The caller forces out the AIL before stopping the +* thread in the common case, which means the delwri +* queue is drained. In the shutdown case, the queue may +* still hold relogged buffers that haven't been +* submitted because they were pinned since added to the +* queue. +* +* Log I/O error processing stales the underlying buffer +* and clears the delwri state, expecting the buf to be +* removed on the next submission attempt. That won't +* happen if we're shutting down, so this is the last +* opportunity to release such buffers from the queue. +*/ +ASSERT (list_empty (&ailp->ail_buf_list) || +XFS_FORCED_SHUTDOWN (ailp->ail_mount)); +xfs_buf_delwri_cancel (&ailp->ail_buf_list);break ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 71/237 kprobes, x86/ptrace.h: Make regs_get_kernel_stack_nth() not fault on bad stack
In reply to Sasha LevinFrom: "Steven Rostedt (VMware)" <[email protected]>
[ Upstream commit c2712b858187f5bcd7b042fe4daa3ba3a12635c0 ]
Andy had some concerns about using regs_get_kernel_stack_nth() in a new function regs_get_kernel_argument() as if there's any error in the stack code, it could cause a bad memory access. To be on the safe side, call probe_kernel_read() on the stack address to be extra careful in accessing the memory. A helper function, regs_get_kernel_stack_nth_addr(), was added to just return the stack address (or NULL if not on the stack), that will be used to find the address (and could be used by other functions) and read the address with kernel_probe_read().
--- arch/x86/include/asm/ptrace.h | 42 +++++++++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 7 deletions(-)
arch/x86/include/asm/ptrace.h +35 -7
@@ -236,24 +236,52 @@ static inline int regs_within_kernel_stack(struct pt_regs *regs, (kernel_stack_pointer(regs) & ~(THREAD_SIZE - 1))); } +/** +* regs_get_kernel_stack_nth_addr() - get the address of the Nth entry on stack +* @regs: pt_regs which contains kernel stack pointer. +* @n: stack entry number. +* +* regs_get_kernel_stack_nth() returns the address of the @n th entry of the +* kernel stack which is specified by @regs. If the @n th entry is NOT in +* the kernel stack, this returns NULL. +*/ +static inline unsigned long *regs_get_kernel_stack_nth_addr (struct pt_regs *regs,unsigned int n) +{ +unsigned long *addr = (unsigned long *)kernel_stack_pointer (regs); + + addr += n; +if (regs_within_kernel_stack (regs, (unsigned long )addr)) +return addr; +else +return NULL ; +} + +/* To avoid include hell, we can't include uaccess.h */ +extern long probe_kernel_read (void *dst,const void *src,size_t size); +/** * regs_get_kernel_stack_nth() - get Nth entry of the stack * @regs: pt_regs which contains kernel stack pointer. * @n: stack entry number. * * regs_get_kernel_stack_nth() returns @n th entry of the kernel stack which -* is specified by @regs. If the @n th entry is NOT in the kernel stack, +* is specified by @regs. If the @n th entry is NOT in the kernel stack * this returns 0. */ static inline unsigned long regs_get_kernel_stack_nth (struct pt_regs *regs,unsigned int n) { -unsigned long *addr = (unsigned long *)kernel_stack_pointer (regs); - addr += n; -if (regs_within_kernel_stack (regs, (unsigned long )addr)) -return *addr; -else -return 0 ; +unsigned long *addr; +unsigned long val; +long ret; + + addr =regs_get_kernel_stack_nth_addr (regs, n); +if (addr) { + ret =probe_kernel_read (&val, addr,sizeof (val)); +if (!ret) +return val; + } +return 0 ; }#define arch_has_single_step () (1)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 72/237 ACPI / scan: Create platform device for INT33FE ACPI nodes
In reply to Sasha LevinFrom: Hans de Goede <[email protected]>
[ Upstream commit 589edb56b424876cbbf61547b987a1f57d7ea99d ]
Bay and Cherry Trail devices with a Dollar Cove or Whiskey Cove PMIC have an ACPI node with a HID of INT33FE which is a "virtual" battery device implementing a standard ACPI battery interface which depends upon a proprietary, undocument OpRegion called BMOP. Since we do have docs for the actual fuel-gauges used on these boards we instead use native fuel-gauge drivers talking directly to the fuel-gauge ICs on boards which rely on this INT33FE device for their battery monitoring.
On boards with a Dollar Cove PMIC the INT33FE device's resources (_CRS) describe a non-existing I2C client at address 0x6b with a bus-speed of 100KHz. This is a problem on some boards since there are actual devices on that same bus which need a speed of 400KHz to function properly.
This commit adds the INT33FE HID to the list of devices with I2C resources which should be enumerated as a platform-device rather then letting the i2c-core instantiate an i2c-client matching the first I2C resource, so that its bus-speed will not influence the max speed of the I2C bus. This fixes e.g. the touchscreen not working on the Teclast X98 II Plus.
The INT33FE device on boards with a Whiskey Cove PMIC is somewhat special. Its first I2C resource is for a secondary I2C address of the PMIC itself, which is already described in an ACPI device with an INT34D3 HID.
But it has 3 more I2C resources describing 3 other chips for which we do need to instantiate I2C clients and which need device-connections added between them for things to work properly. This special case is handled by the drivers/platform/x86/intel_cht_int33fe.c code.
Before this commit that code was binding to the i2c-client instantiated for the secondary I2C address of the PMIC, since we now instantiate a platform device for the INT33FE device instead, this commit also changes the intel_cht_int33fe driver from an i2c driver to a platform driver.
This also brings the intel_cht_int33fe drv inline with how we instantiate multiple i2c clients from a single ACPI device in other cases, as done by the drivers/platform/x86/i2c-multi-instantiate.c code.
--- drivers/acpi/scan.c | 1 + drivers/platform/x86/intel_cht_int33fe.c | 24 +++++++++--------------- 2 files changed, 10 insertions(+), 15 deletions(-)
drivers/acpi/scan.c +1 -0
@@ -1550,6 +1550,7 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device)*/ static const struct acpi_device_id i2c_multi_instantiate_ids[] = { {"BSG1160" , }, + {"INT33FE" , }, {} };
drivers/platform/x86/intel_cht_int33fe.c +9 -15
@@ -24,6 +24,7 @@#include <linux/i2c.h> #include <linux/interrupt.h> #include <linux/module.h> +#include <linux/platform_device.h> #include <linux/regulator/consumer.h> #include <linux/slab.h>
@@ -88,9 +89,9 @@ static const struct property_entry fusb302_props[] = { { } }; -static int cht_int33fe_probe (struct i2c_client *client) +static int cht_int33fe_probe (struct platform_device *pdev) { -struct device *dev = &client->dev; +struct device *dev = &pdev->dev;struct i2c_board_info board_info;struct cht_int33fe_data *data;struct i2c_client *max17047;
@@ -207,7 +208,7 @@ static int cht_int33fe_probe(struct i2c_client *client)if (!data->pi3usb30532) goto out_unregister_fusb302; -i2c_set_clientdata (client, data); +platform_set_drvdata (pdev, data);return 0 ;
@@ -223,9 +224,9 @@ static int cht_int33fe_probe(struct i2c_client *client)return -EPROBE_DEFER ;/* Wait for the i2c-adapter to load */ } -static int cht_int33fe_remove (struct i2c_client *i2c) +static int cht_int33fe_remove (struct platform_device *pdev) { -struct cht_int33fe_data *data =i2c_get_clientdata (i2c); +struct cht_int33fe_data *data =platform_get_drvdata (pdev);i2c_unregister_device (data->pi3usb30532);i2c_unregister_device (data->fusb302);
@@ -237,29 +238,22 @@ static int cht_int33fe_remove(struct i2c_client *i2c)return 0 ; } -static const struct i2c_device_id cht_int33fe_i2c_id[] = { - { } -}; -MODULE_DEVICE_TABLE (i2c, cht_int33fe_i2c_id); -static const struct acpi_device_id cht_int33fe_acpi_ids[] = { {"INT33FE" , }, { } };MODULE_DEVICE_TABLE (acpi, cht_int33fe_acpi_ids); -static struct i2c_driver cht_int33fe_driver = { +static struct platform_driver cht_int33fe_driver = { .driver = { .name ="Intel Cherry Trail ACPI INT33FE driver" , .acpi_match_table =ACPI_PTR (cht_int33fe_acpi_ids), }, - .probe_new = cht_int33fe_probe, + .probe = cht_int33fe_probe, .remove = cht_int33fe_remove, - .id_table = cht_int33fe_i2c_id, - .disable_i2c_core_irq_mapping = true, }; -module_i2c_driver (cht_int33fe_driver); +module_platform_driver (cht_int33fe_driver);MODULE_DESCRIPTION ("Intel Cherry Trail ACPI INT33FE pseudo device driver" );MODULE_AUTHOR ("Hans de Goede <[email protected]>" );
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 73/237 PM / Domains: Deal with multiple states but no governor in genpd
In reply to Sasha LevinFrom: Ulf Hansson <[email protected]>
[ Upstream commit 2c9b7f8772033cc8bafbd4eefe2ca605bf3eb094 ]
A caller of pm_genpd_init() that provides some states for the genpd via the ->states pointer in the struct generic_pm_domain, should also provide a governor. This because it's the job of the governor to pick a state that satisfies the constraints.
Therefore, let's print a warning to inform the user about such bogus configuration and avoid to bail out, by instead picking the shallowest state before genpd invokes the ->power_off() callback.
--- drivers/base/power/domain.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/base/power/domain.c +6 -0
@@ -467,6 +467,10 @@ static int genpd_power_off(struct generic_pm_domain *genpd, bool one_dev_on,return -EAGAIN ; } +/* Default to shallowest state. */ +if (!genpd->gov) + genpd->state_idx =0 ; +if (genpd->power_off) {int ret;
@@ -1686,6 +1690,8 @@ int pm_genpd_init(struct generic_pm_domain *genpd, ret =genpd_set_default_power_state (genpd);if (ret)return ret; + }else if (!gov) { +pr_warn ("%s : no governor for states\n" , genpd->name); }device_initialize (&genpd->dev);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 74/237 ALSA: i2c/cs8427: Fix int to char conversion
In reply to Sasha LevinFrom: Philipp Klocke <[email protected]>
[ Upstream commit eb7ebfa3c1989aa8e59d5e68ab3cddd7df1bfb27 ]
Compiling with clang yields the following warning:
sound/i2c/cs8427.c:140:31: warning: implicit conversion from 'int' to 'char' changes value from 160 to -96 [-Wconstant-conversion]
data[0] = CS8427_REG_AUTOINC | CS8427_REG_CORU_DATABUF;
~ ~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~Because CS8427_REG_AUTOINC is defined as 128, it is too big for a char field.
So change data from char to unsigned char, that it can hold the value.
This patch does not change the generated code.
--- sound/i2c/cs8427.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/i2c/cs8427.c +1 -1
@@ -118,7 +118,7 @@ static int snd_cs8427_send_corudata(struct snd_i2c_device *device,struct cs8427 *chip = device->private_data;char *hw_data = udata ? chip->playback.hw_udata : chip->playback.hw_status; -char data[32 ]; +unsigned char data[32 ];int err, idx;if (!memcmp (hw_data, ndata, count))
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 75/237 macintosh/windfarm_smu_sat: Fix debug output
In reply to Sasha LevinFrom: Benjamin Herrenschmidt <[email protected]>
[ Upstream commit fc0c8b36d379a046525eacb9c3323ca635283757 ]
There's some antiquated debug output that's trying to do a hand-made hexdump and turning into horrible 1-byte-per-line output these days.
Use print_hex_dump() instead
--- drivers/macintosh/windfarm_smu_sat.c | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-)
drivers/macintosh/windfarm_smu_sat.c +7 -18
@@ -22,14 +22,6 @@#define VERSION "1.0" -#define DEBUG - -#ifdef DEBUG -#define DBG(args...) printk(args) -#else -#define DBG(args...) do { } while(0) -#endif -/* If the cache is older than 800ms we'll refetch it */ #define MAX_AGE msecs_to_jiffies(800)
@@ -106,13 +98,10 @@ struct smu_sdbp_header *smu_sat_get_sdb_partition(unsigned int sat_id, int id, buf[i+2 ] = data[3 ]; buf[i+3 ] = data[2 ]; } -#ifdef DEBUG -DBG (KERN_DEBUG "sat %d partition %x:" , sat_id, id); -for (i =0 ; i < len; ++i) -DBG (" %x" , buf[i]); -DBG ("\n" ); -#endif +printk (KERN_DEBUG "sat %d partition %x:" , sat_id, id); +print_hex_dump (KERN_DEBUG ," " ,DUMP_PREFIX_OFFSET , +16 ,1 , buf, len, false);if (size) *size = len;return (struct smu_sdbp_header *) buf;
@@ -132,13 +121,13 @@ static int wf_sat_read_cache(struct wf_sat *sat)if (err <0 )return err; sat->last_read = jiffies; +#ifdef LOTSA_DEBUG {int i; -DBG (KERN_DEBUG "wf_sat_get: data is" ); -for (i =0 ; i <16 ; ++i) -DBG (" %.2x" , sat->cache[i]); -DBG ("\n" ); +printk (KERN_DEBUG "wf_sat_get: data is" ); +print_hex_dump (KERN_DEBUG ," " ,DUMP_PREFIX_OFFSET , +16 ,1 , sat->cache,16 , false); }#endif return 0 ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 76/237 PCI: vmd: Detach resources after stopping root bus
In reply to Sasha LevinFrom: Jon Derrick <[email protected]>
[ Upstream commit dc8af3a827df6d4bb925d3b81b7ec94a7cce9482 ]
The VMD removal path calls pci_stop_root_busi(), which tears down the pcie tree, including detaching all of the attached drivers. During driver detachment, devices may use pci_release_region() to release resources. This path relies on the resource being accessible in resource tree.
By detaching the child domain from the parent resource domain prior to stopping the bus, we are preventing the list traversal from finding the resource to be freed. If we instead detach the resource after stopping the bus, we will have properly freed the resource and detaching is simply accounting at that point.
Without this order, the resource is never freed and is orphaned on VMD removal, leading to a warning:
[ 181.940162] Trying to free nonexistent resource <e5a10000-e5a13fff>
--- drivers/pci/controller/vmd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/controller/vmd.c +1 -1
@@ -818,12 +818,12 @@ static void vmd_remove(struct pci_dev *dev) {struct vmd_dev *vmd =pci_get_drvdata (dev); -vmd_detach_resources (vmd);sysfs_remove_link (&vmd->dev->dev.kobj,"domain" );pci_stop_root_bus (vmd->bus);pci_remove_root_bus (vmd->bus);vmd_cleanup_srcu (vmd);vmd_teardown_dma_ops (vmd); +vmd_detach_resources (vmd);irq_domain_remove (vmd->irq_domain); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 77/237 USB: misc: appledisplay: fix backlight update_status return code
In reply to Sasha LevinFrom: Mattias Jacobsson <[email protected]>
[ Upstream commit 090158555ff8d194a98616034100b16697dd80d0 ]
Upon success the update_status handler returns a positive number corresponding to the number of bytes transferred by usb_control_msg. However the return code of the update_status handler should indicate if an error occurred(negative) or how many bytes of the user's input to sysfs that was consumed. Return code zero indicates all bytes were consumed.
The bug can for example result in the update_status handler being called twice, the second time with only the "unconsumed" part of the user's input to sysfs. Effectively setting an incorrect brightness.
Change the update_status handler to return zero for all successful transactions and forward usb_control_msg's error code upon failure.
--- drivers/usb/misc/appledisplay.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/usb/misc/appledisplay.c +5 -2
@@ -148,8 +148,11 @@ static int appledisplay_bl_update_status(struct backlight_device *bd) pdata->msgdata,2 , ACD_USB_TIMEOUT);mutex_unlock (&pdata->sysfslock); - -return retval; + +if (retval <0 ) +return retval; +else +return 0 ; }static int appledisplay_bl_get_brightness (struct backlight_device *bd)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 78/237 usbip: tools: fix atoi() on non-null terminated string
In reply to Sasha LevinFrom: Colin Ian King <[email protected]>
[ Upstream commit e325808c0051b16729ffd472ff887c6cae5c6317 ]
Currently the call to atoi is being passed a single char string that is not null terminated, so there is a potential read overrun along the stack when parsing for an integer value. Fix this by instead using a 2 char string that is initialized to all zeros to ensure that a 1 char read into the string is always terminated with a \0.
Detected by cppcheck:
"Invalid atoi() argument nr 1. A nul-terminated string is required."
--- tools/usb/usbip/libsrc/usbip_host_common.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
tools/usb/usbip/libsrc/usbip_host_common.c +3 -3
@@ -43,7 +43,7 @@ static int32_t read_attr_usbip_status(struct usbip_usb_device *udev)int size;int fd;int length; -char status; +char status[2 ] = {0 };int value =0 ; size = snprintf(status_attr_path, sizeof(status_attr_path),
@@ -61,14 +61,14 @@ static int32_t read_attr_usbip_status(struct usbip_usb_device *udev)return -1 ; } - length =read (fd, &status,1 ); + length =read (fd, status,1 );if (length <0 ) {err ("error reading attribute %s" , status_attr_path);close (fd);return -1 ; } - value =atoi (&status); + value =atoi (status);return value; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 79/237 sctp: use sk_wmem_queued to check for writable space
In reply to Sasha LevinFrom: Xin Long <[email protected]>
[ Upstream commit cd305c74b0f8b49748a79a8f67fc8e5e3e0c4794 ]
sk->sk_wmem_queued is used to count the size of chunks in out queue while sk->sk_wmem_alloc is for counting the size of chunks has been sent. sctp is increasing both of them before enqueuing the chunks, and using sk->sk_wmem_alloc to check for writable space.
However, sk_wmem_alloc is also increased by 1 for the skb allocked for sending in sctp_packet_transmit() but it will not wake up the waiters when sk_wmem_alloc is decreased in this skb's destructor.
If msg size is equal to sk_sndbuf and sendmsg is waiting for sndbuf, the check 'msg_len <= sctp_wspace(asoc)' in sctp_wait_for_sndbuf() will keep waiting if there's a skb allocked in sctp_packet_transmit, and later even if this skb got freed, the waiting thread will never get waked up.
This issue has been there since very beginning, so we change to use sk->sk_wmem_queued to check for writable space as sk_wmem_queued is not increased for the skb allocked for sending, also as TCP does.
SOCK_SNDBUF_LOCK check is also removed here as it's for tx buf auto tuning which I will add in another patch.
--- net/sctp/socket.c | 38 +++++++++----------------------------- 1 file changed, 9 insertions(+), 29 deletions(-)
net/sctp/socket.c +9 -29
@@ -83,7 +83,7 @@#include <net/sctp/stream_sched.h> /* Forward declarations for internal helper functions. */ -static int sctp_writeable (struct sock *sk); +static bool sctp_writeable (struct sock *sk);static void sctp_wfree (struct sk_buff *skb);static int sctp_wait_for_sndbuf (struct sctp_association *asoc,long *timeo_p,size_t msg_len);
@@ -119,25 +119,10 @@ static void sctp_enter_memory_pressure(struct sock *sk)/* Get the sndbuf space available at the time on the association. */ static inline int sctp_wspace (struct sctp_association *asoc) { -int amt; +struct sock *sk = asoc->base.sk; -if (asoc->ep->sndbuf_policy) - amt = asoc->sndbuf_used; -else - amt =sk_wmem_alloc_get (asoc->base.sk); - -if (amt >= asoc->base.sk->sk_sndbuf) { -if (asoc->base.sk->sk_userlocks &SOCK_SNDBUF_LOCK ) - amt =0 ; -else { - amt =sk_stream_wspace (asoc->base.sk); -if (amt <0 ) - amt =0 ; - } - }else { - amt = asoc->base.sk->sk_sndbuf - amt; - } -return amt; +return asoc->ep->sndbuf_policy ? sk->sk_sndbuf - asoc->sndbuf_used + :sk_stream_wspace (sk); }/* Increment the used sndbuf space count of the corresponding association by
@@ -1928,10 +1913,10 @@ static int sctp_sendmsg_to_asoc(struct sctp_association *asoc, asoc->pmtu_pending =0 ; } -if (sctp_wspace (asoc) < msg_len) +if (sctp_wspace (asoc) < (int )msg_len)sctp_prsctp_prune (asoc, sinfo, msg_len -sctp_wspace (asoc)); -if (!sctp_wspace (asoc)) { +if (sctp_wspace (asoc) <=0 ) { timeo =sock_sndtimeo (sk, msg->msg_flags &MSG_DONTWAIT ); err =sctp_wait_for_sndbuf (asoc, &timeo, msg_len);if (err)
@@ -8516,7 +8501,7 @@ static int sctp_wait_for_sndbuf(struct sctp_association *asoc, long *timeo_p, goto do_error;if (signal_pending (current)) goto do_interrupted; -if (msg_len <=sctp_wspace (asoc)) +if ((int )msg_len <=sctp_wspace (asoc))break ;/* Let another process have a go. Since we are going
@@ -8591,14 +8576,9 @@ void sctp_write_space(struct sock *sk)* UDP-style sockets or TCP-style sockets, this code should work. * - Daisy */ -static int sctp_writeable (struct sock *sk) +static bool sctp_writeable (struct sock *sk) { -int amt =0 ; - - amt = sk->sk_sndbuf -sk_wmem_alloc_get (sk); -if (amt <0 ) - amt =0 ; -return amt; +return sk->sk_sndbuf > sk->sk_wmem_queued; }/* Wait for an association to go into ESTABLISHED state. If timeout is 0,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 80/237 dm raid: avoid bitmap with raid4/5/6 journal device
In reply to Sasha LevinFrom: Heinz Mauelshagen <[email protected]>
[ Upstream commit d857ad75edf3c0066fcd920746f9dc75382b3324 ]
With raid4/5/6, journal device and write intent bitmap are mutually exclusive.
--- drivers/md/dm-raid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/md/dm-raid.c +1 -1
@@ -2475,7 +2475,7 @@ static int super_validate(struct raid_set *rs, struct md_rdev *rdev) }/* Enable bitmap creation for RAID levels != 0 */ - mddev->bitmap_info.offset =rt_is_raid0 (rs->raid_type) ?0 :to_sector (4096 ); + mddev->bitmap_info.offset = (rt_is_raid0 (rs->raid_type) || rs->journal_dev.dev) ?0 :to_sector (4096 ); mddev->bitmap_info.default_offset = mddev->bitmap_info.offset;if (!test_and_clear_bit (FirstUse, &rdev->flags)) {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 81/237 selftests/bpf: fix file resource leak in load_kallsyms
In reply to Sasha LevinFrom: Peng Hao <[email protected]>
[ Upstream commit 1bd70d2eba9d90eb787634361f0f6fa2c86b3f6d ]
FILE pointer variable f is opened but never closed.
--- tools/testing/selftests/bpf/trace_helpers.c | 1 + 1 file changed, 1 insertion(+)
tools/testing/selftests/bpf/trace_helpers.c +1 -0
@@ -41,6 +41,7 @@ int load_kallsyms(void) syms[i].name =strdup (func); i++; } +fclose (f); sym_cnt = i;qsort (syms, sym_cnt,sizeof (struct ksym ), ksym_cmp);return 0 ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 82/237 SUNRPC: Fix a compile warning for cmpxchg64()
In reply to Sasha LevinFrom: Trond Myklebust <[email protected]>
[ Upstream commit e732f4485a150492b286f3efc06f9b34dd6b9995 ]
--- net/sunrpc/auth_gss/gss_krb5_seal.c | 1 + 1 file changed, 1 insertion(+)
net/sunrpc/auth_gss/gss_krb5_seal.c +1 -0
@@ -63,6 +63,7 @@#include <linux/sunrpc/gss_krb5.h> #include <linux/random.h> #include <linux/crypto.h> +#include <linux/atomic.h> #if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 83/237 sunrpc: safely reallow resvport min/max inversion
In reply to Sasha LevinFrom: "J. Bruce Fields" <[email protected]>
[ Upstream commit 826799e66e8683e5698e140bb9ef69afc8c0014e ]
Commits ffb6ca33b04b and e08ea3a96fc7 prevent setting xprt_min_resvport greater than xprt_max_resvport, but may also break simple code that sets one parameter then the other, if the new range does not overlap the old.
Also it looks racy to me, unless there's some serialization I'm not seeing. Granted it would probably require malicious privileged processes (unless there's a chance these might eventually be settable in unprivileged containers), but still it seems better not to let userspace panic the kernel.
Simpler seems to be to allow setting the parameters to whatever you want but interpret xprt_min_resvport > xprt_max_resvport as the empty range.
--- net/sunrpc/xprtsock.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-)
net/sunrpc/xprtsock.c +18 -16
@@ -129,7 +129,7 @@ static struct ctl_table xs_tunables_table[] = { .mode = 0644, .proc_handler = proc_dointvec_minmax, .extra1 = &xprt_min_resvport_limit, - .extra2 = &xprt_max_resvport + .extra2 = &xprt_max_resvport_limit }, { .procname = "max_resvport",
@@ -137,7 +137,7 @@ static struct ctl_table xs_tunables_table[] = { .maxlen = sizeof(unsigned int), .mode = 0644, .proc_handler = proc_dointvec_minmax, - .extra1 = &xprt_min_resvport, + .extra1 = &xprt_min_resvport_limit, .extra2 = &xprt_max_resvport_limit }, {
@@ -1773,11 +1773,17 @@ static void xs_udp_timer(struct rpc_xprt *xprt, struct rpc_task *task)spin_unlock_bh (&xprt->transport_lock); } -static unsigned short xs_get_random_port (void ) +static int xs_get_random_port (void ) { -unsigned short range = xprt_max_resvport - xprt_min_resvport +1 ; -unsigned short rand = (unsigned short )prandom_u32 () % range; -return rand + xprt_min_resvport; +unsigned short min = xprt_min_resvport, max = xprt_max_resvport; +unsigned short range; +unsigned short rand; + +if (max < min) +return -EADDRINUSE ; + range = max - min +1 ; + rand = (unsigned short )prandom_u32 () % range; +return rand + min; }/**
@@ -1833,9 +1839,9 @@ static void xs_set_srcport(struct sock_xprt *transport, struct socket *sock) transport->srcport =xs_sock_getport (sock); } -static unsigned short xs_get_srcport (struct sock_xprt *transport) +static int xs_get_srcport (struct sock_xprt *transport) { -unsigned short port = transport->srcport; +int port = transport->srcport;if (port ==0 && transport->xprt.resvport) port =xs_get_random_port ();
@@ -1856,7 +1862,7 @@ static int xs_bind(struct sock_xprt *transport, struct socket *sock) {struct sockaddr_storage myaddr;int err, nloop =0 ; -unsigned short port =xs_get_srcport (transport); +int port =xs_get_srcport (transport);unsigned short last;/*
@@ -1874,8 +1880,8 @@ static int xs_bind(struct sock_xprt *transport, struct socket *sock)* transport->xprt.resvport == 1) xs_get_srcport above will * ensure that port is non-zero and we will bind as needed. */ -if (port ==0 ) -return 0 ; +if (port <=0 ) +return port;memcpy (&myaddr, &transport->srcaddr, transport->xprt.addrlen); do {
@@ -3317,12 +3323,8 @@ static int param_set_uint_minmax(const char *val,static int param_set_portnr (const char *val,const struct kernel_param *kp) { -if (kp->arg == &xprt_min_resvport) -return param_set_uint_minmax (val, kp, -RPC_MIN_RESVPORT , - xprt_max_resvport);return param_set_uint_minmax (val, kp, - xprt_min_resvport, +RPC_MIN_RESVPORT ,RPC_MAX_RESVPORT ); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 84/237 atm: zatm: Fix empty body Clang warnings
In reply to Sasha LevinFrom: Nathan Chancellor <[email protected]>
[ Upstream commit 64b9d16e2d02ca6e5dc8fcd30cfd52b0ecaaa8f4 ]
Clang warns:
drivers/atm/zatm.c:513:7: error: while loop has empty body [-Werror,-Wempty-body]
zwait;
^drivers/atm/zatm.c:513:7: note: put the semicolon on a separate line to silence this warning
Get rid of this warning by using an empty do-while loop. While we're at it, add parentheses to make it clear that this is a function-like macro.
--- drivers/atm/zatm.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-)
drivers/atm/zatm.c +21 -21
@@ -126,7 +126,7 @@ static unsigned long dummy[2] = {0,0};#define zin_n (r) inl(zatm_dev->base+r*4)#define zin (r) inl(zatm_dev->base+uPD98401_##r*4)#define zout (v,r) outl(v,zatm_dev->base+uPD98401_##r*4) -#define zwait while (zin(CMR) & uPD98401_BUSY) +#define zwait () do {} while (zin(CMR) & uPD98401_BUSY)/* RX0, RX1, TX0, TX1 */ static const int mbx_entries[NR_MBX ] = {1024 ,1024 ,1024 ,1024 };
@@ -140,7 +140,7 @@ static const int mbx_esize[NR_MBX] = { 16,16,4,4 }; /* entry size in bytes */static void zpokel (struct zatm_dev *zatm_dev,u32 value,u32 addr) { - zwait; +zwait ();zout (value,CER );zout (uPD98401_IND_ACC | uPD98401_IA_BALL | (uPD98401_IA_TGT_CM << uPD98401_IA_TGT_SHIFT) | addr,CMR );
@@ -149,10 +149,10 @@ static void zpokel(struct zatm_dev *zatm_dev,u32 value,u32 addr)static u32 zpeekl (struct zatm_dev *zatm_dev,u32 addr) { - zwait; +zwait ();zout (uPD98401_IND_ACC | uPD98401_IA_BALL | uPD98401_IA_RW | (uPD98401_IA_TGT_CM << uPD98401_IA_TGT_SHIFT) | addr,CMR ); - zwait; +zwait ();return zin (CER ); }
@@ -241,7 +241,7 @@ static void refill_pool(struct atm_dev *dev,int pool) }if (first) {spin_lock_irqsave (&zatm_dev->lock, flags); - zwait; +zwait ();zout (virt_to_bus (first),CER );zout (uPD98401_ADD_BAT | (pool << uPD98401_POOL_SHIFT) | count,CMR );
@@ -508,9 +508,9 @@ static int open_rx_first(struct atm_vcc *vcc) }if (zatm_vcc->pool <0 )return -EMSGSIZE ;spin_lock_irqsave (&zatm_dev->lock, flags); - zwait; +zwait ();zout (uPD98401_OPEN_CHAN,CMR ); - zwait; +zwait ();DPRINTK ("0x%x 0x%x\n" ,zin (CMR ),zin (CER )); chan = (zin (CMR ) & uPD98401_CHAN_ADDR) >> uPD98401_CHAN_ADDR_SHIFT;spin_unlock_irqrestore (&zatm_dev->lock, flags);
@@ -571,21 +571,21 @@ static void close_rx(struct atm_vcc *vcc) pos = vcc->vci >>1 ; shift = (1 -(vcc->vci &1 )) <<4 ;zpokel (zatm_dev,zpeekl (zatm_dev,pos) & ~(0xffff << shift),pos); - zwait; +zwait ();zout (uPD98401_NOP,CMR ); - zwait; +zwait ();zout (uPD98401_NOP,CMR );spin_unlock_irqrestore (&zatm_dev->lock, flags); }spin_lock_irqsave (&zatm_dev->lock, flags); - zwait; +zwait ();zout (uPD98401_DEACT_CHAN | uPD98401_CHAN_RT | (zatm_vcc->rx_chan << uPD98401_CHAN_ADDR_SHIFT),CMR ); - zwait; +zwait ();udelay (10 );/* why oh why ... ? */ zout (uPD98401_CLOSE_CHAN | uPD98401_CHAN_RT | (zatm_vcc->rx_chan << uPD98401_CHAN_ADDR_SHIFT),CMR ); - zwait; +zwait ();if (!(zin (CMR ) & uPD98401_CHAN_ADDR)) printk(KERN_CRIT DEV_LABEL "(itf %d): can't close RX channel ""%d\n" ,vcc->dev->number,zatm_vcc->rx_chan);
@@ -699,7 +699,7 @@ printk("NONONONOO!!!!\n");skb_queue_tail (&zatm_vcc->tx_queue,skb);DPRINTK ("QRP=0x%08lx\n" ,zpeekl (zatm_dev,zatm_vcc->tx_chan*VC_SIZE /4 + uPD98401_TXVC_QRP)); - zwait; +zwait ();zout (uPD98401_TX_READY | (zatm_vcc->tx_chan << uPD98401_CHAN_ADDR_SHIFT),CMR );spin_unlock_irqrestore (&zatm_dev->lock, flags);
@@ -891,12 +891,12 @@ static void close_tx(struct atm_vcc *vcc) }spin_lock_irqsave (&zatm_dev->lock, flags);#if 0 - zwait; +zwait ();zout (uPD98401_DEACT_CHAN | (chan << uPD98401_CHAN_ADDR_SHIFT),CMR );#endif - zwait; +zwait ();zout (uPD98401_CLOSE_CHAN | (chan << uPD98401_CHAN_ADDR_SHIFT),CMR ); - zwait; +zwait ();if (!(zin (CMR ) & uPD98401_CHAN_ADDR)) printk(KERN_CRIT DEV_LABEL "(itf %d): can't close TX channel ""%d\n" ,vcc->dev->number,chan);
@@ -926,9 +926,9 @@ static int open_tx_first(struct atm_vcc *vcc) zatm_vcc->tx_chan =0 ;if (vcc->qos.txtp.traffic_class ==ATM_NONE )return 0 ;spin_lock_irqsave (&zatm_dev->lock, flags); - zwait; +zwait ();zout (uPD98401_OPEN_CHAN,CMR ); - zwait; +zwait ();DPRINTK ("0x%x 0x%x\n" ,zin (CMR ),zin (CER )); chan = (zin (CMR ) & uPD98401_CHAN_ADDR) >> uPD98401_CHAN_ADDR_SHIFT;spin_unlock_irqrestore (&zatm_dev->lock, flags);
@@ -1557,7 +1557,7 @@ static void zatm_phy_put(struct atm_dev *dev,unsigned char value,struct zatm_dev *zatm_dev; zatm_dev =ZATM_DEV (dev); - zwait; +zwait ();zout (value,CER );zout (uPD98401_IND_ACC | uPD98401_IA_B0 | (uPD98401_IA_TGT_PHY << uPD98401_IA_TGT_SHIFT) | addr,CMR );
@@ -1569,10 +1569,10 @@ static unsigned char zatm_phy_get(struct atm_dev *dev,unsigned long addr)struct zatm_dev *zatm_dev; zatm_dev =ZATM_DEV (dev); - zwait; +zwait ();zout (uPD98401_IND_ACC | uPD98401_IA_B0 | uPD98401_IA_RW | (uPD98401_IA_TGT_PHY << uPD98401_IA_TGT_SHIFT) | addr,CMR ); - zwait; +zwait ();return zin (CER ) &0xff ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 85/237 s390/perf: Return error when debug_register fails
In reply to Sasha LevinFrom: Thomas Richter <[email protected]>
[ Upstream commit ec0c0bb489727de0d4dca6a00be6970ab8a3b30a ]
Return an error when the function debug_register() fails allocating the debug handle.
Also remove the registered debug handle when the initialization fails later on.
--- arch/s390/kernel/perf_cpum_sf.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
arch/s390/kernel/perf_cpum_sf.c +5 -1
@@ -2045,14 +2045,17 @@ static int __init init_cpum_sampling_pmu(void) } sfdbg =debug_register (KMSG_COMPONENT ,2 ,1 ,80 ); -if (!sfdbg) +if (!sfdbg) {pr_err ("Registering for s390dbf failed\n" ); +return -ENOMEM ; + }debug_register_view (sfdbg, &debug_sprintf_view); err =register_external_irq (EXT_IRQ_MEASURE_ALERT , cpumf_measurement_alert);if (err) {pr_cpumsf_err (RS_INIT_FAILURE_ALRT ); +debug_unregister (sfdbg); goto out; }
@@ -2061,6 +2064,7 @@ static int __init init_cpum_sampling_pmu(void)pr_cpumsf_err (RS_INIT_FAILURE_PERF );unregister_external_irq (EXT_IRQ_MEASURE_ALERT , cpumf_measurement_alert); +debug_unregister (sfdbg); goto out; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 86/237 swiotlb: do not panic on mapping failures
In reply to Sasha LevinFrom: Christoph Hellwig <[email protected]>
[ Upstream commit 8088546832aa2c0d8f99dd56edf6384f8a9b63b3 ]
All properly written drivers now have error handling in the dma_map_single / dma_map_page callers. As swiotlb_tbl_map_single already prints a useful warning when running out of swiotlb pool space we can also remove swiotlb_full entirely as it serves no purpose now.
--- kernel/dma/swiotlb.c | 33 +-------------------------------- 1 file changed, 1 insertion(+), 32 deletions(-)
kernel/dma/swiotlb.c +1 -32
@@ -761,34 +761,6 @@ static bool swiotlb_free_buffer(struct device *dev, size_t size,return true; } -static void -swiotlb_full (struct device *dev,size_t size,enum dma_data_direction dir, -int do_panic) -{ -if (swiotlb_force ==SWIOTLB_NO_FORCE ) -return ; - -/* -* Ran out of IOMMU space for this operation. This is very bad. -* Unfortunately the drivers cannot handle this operation properly. -* unless they check for dma_mapping_error (most don't) -* When the mapping is small enough return a static buffer to limit -* the damage, or panic when the transfer is too big. -*/ -dev_err_ratelimited (dev,"DMA: Out of SW-IOMMU space for %zu bytes\n" , - size); - -if (size <= io_tlb_overflow || !do_panic) -return ; - -if (dir ==DMA_BIDIRECTIONAL ) -panic ("DMA: Random memory could be DMA accessed\n" ); -if (dir ==DMA_FROM_DEVICE ) -panic ("DMA: Random memory could be DMA written\n" ); -if (dir ==DMA_TO_DEVICE ) -panic ("DMA: Random memory could be DMA read\n" ); -} -/* * Map a single buffer of the indicated size for DMA in streaming mode. The * physical address to use is returned.
@@ -817,10 +789,8 @@ dma_addr_t swiotlb_map_page(struct device *dev, struct page *page,/* Oh well, have to allocate and map a bounce buffer. */ map =map_single (dev, phys, size, dir, attrs); -if (map ==SWIOTLB_MAP_ERROR ) { -swiotlb_full (dev, size, dir,1 ); +if (map ==SWIOTLB_MAP_ERROR )return __phys_to_dma (dev, io_tlb_overflow_buffer); - } dev_addr =__phys_to_dma (dev, map);
@@ -954,7 +924,6 @@ swiotlb_map_sg_attrs(struct device *hwdev, struct scatterlist *sgl, int nelems,if (map ==SWIOTLB_MAP_ERROR ) {/* Don't panic here, we expect map_sg users to do proper error handling. */ -swiotlb_full (hwdev, sg->length, dir,0 ); attrs |=DMA_ATTR_SKIP_CPU_SYNC ;swiotlb_unmap_sg_attrs (hwdev, sgl, i, dir, attrs);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 87/237 spi: omap2-mcspi: Set FIFO DMA trigger level to word length
In reply to Sasha LevinFrom: Vignesh R <[email protected]>
[ Upstream commit b682cffa3ac6d9d9e16e9b413c45caee3b391fab ]
McSPI has 32 byte FIFO in Transmit-Receive mode. Current code tries to configuration FIFO watermark level for DMA trigger to be GCD of transfer length and max FIFO size which would mean trigger level may be set to 32 for transmit-receive mode if length is aligned. This does not work in case of SPI slave mode where FIFO always needs to have data ready whenever master starts the clock. With DMA trigger size of 32 there will be a small window during slave TX where DMA is still putting data into FIFO but master would have started clock for next byte, resulting in shifting out of stale data. Similarly, on Slave RX side there may be RX FIFO overflow
Fix this by setting FIFO watermark for DMA trigger to word length. This means DMA is triggered as soon as FIFO has space for word length bytes and DMA would make sure FIFO is almost always full therefore improving FIFO occupancy in both master and slave mode.
--- drivers/spi/spi-omap2-mcspi.c | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-)
drivers/spi/spi-omap2-mcspi.c +7 -19
@@ -299,7 +299,7 @@ static void omap2_mcspi_set_fifo(const struct spi_device *spi,struct omap2_mcspi_cs *cs = spi->controller_state;struct omap2_mcspi *mcspi;unsigned int wcnt; -int max_fifo_depth, fifo_depth, bytes_per_word; +int max_fifo_depth, bytes_per_word;u32 chconf, xferlevel; mcspi =spi_master_get_devdata (master);
@@ -315,10 +315,6 @@ static void omap2_mcspi_set_fifo(const struct spi_device *spi,else max_fifo_depth =OMAP2_MCSPI_MAX_FIFODEPTH ; - fifo_depth =gcd (t->len, max_fifo_depth); -if (fifo_depth <2 || fifo_depth % bytes_per_word !=0 ) - goto disable_fifo; - wcnt = t->len / bytes_per_word;if (wcnt >OMAP2_MCSPI_MAX_FIFOWCNT ) goto disable_fifo;
@@ -326,16 +322,17 @@ static void omap2_mcspi_set_fifo(const struct spi_device *spi, xferlevel = wcnt <<16 ;if (t->rx_buf !=NULL ) { chconf |=OMAP2_MCSPI_CHCONF_FFER ; - xferlevel |= (fifo_depth -1 ) <<8 ; + xferlevel |= (bytes_per_word -1 ) <<8 ; } +if (t->tx_buf !=NULL ) { chconf |=OMAP2_MCSPI_CHCONF_FFET ; - xferlevel |= fifo_depth -1 ; + xferlevel |= bytes_per_word -1 ; }mcspi_write_reg (master,OMAP2_MCSPI_XFERLEVEL , xferlevel);mcspi_write_chconf0 (spi, chconf); - mcspi->fifo_depth = fifo_depth; + mcspi->fifo_depth = max_fifo_depth;return ; }
@@ -585,7 +582,6 @@ omap2_mcspi_txrx_dma(struct spi_device *spi, struct spi_transfer *xfer)struct dma_slave_config cfg;enum dma_slave_buswidth width;unsigned es; -u32 burst;void __iomem *chstat_reg;void __iomem *irqstat_reg;int wait_res;
@@ -605,22 +601,14 @@ omap2_mcspi_txrx_dma(struct spi_device *spi, struct spi_transfer *xfer) } count = xfer->len; - burst =1 ; - -if (mcspi->fifo_depth >0 ) { -if (count > mcspi->fifo_depth) - burst = mcspi->fifo_depth / es; -else - burst = count / es; - }memset (&cfg,0 ,sizeof (cfg)); cfg.src_addr = cs->phys +OMAP2_MCSPI_RX0 ; cfg.dst_addr = cs->phys +OMAP2_MCSPI_TX0 ; cfg.src_addr_width = width; cfg.dst_addr_width = width; - cfg.src_maxburst = burst; - cfg.dst_maxburst = burst; + cfg.src_maxburst = es; + cfg.dst_maxburst = es; rx = xfer->rx_buf; tx = xfer->tx_buf;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 88/237 x86/intel_rdt: Prevent pseudo-locking from using stale pointers
In reply to Sasha LevinFrom: Jithu Joseph <[email protected]>
[ Upstream commit b61b8bba18fe2b63d38fdaf9b83de25e2d787dfe ]
When the last CPU in an rdt_domain goes offline, its rdt_domain struct gets freed. Current pseudo-locking code is unaware of this scenario and tries to dereference the freed structure in a few places.
Add checks to prevent pseudo-locking code from doing this.
While further work is needed to seamlessly restore resource groups (not just pseudo-locking) to their configuration when the domain is brought back online, the immediate issue of invalid pointers is addressed here.
--- arch/x86/kernel/cpu/intel_rdt.c | 7 ++++ arch/x86/kernel/cpu/intel_rdt_ctrlmondata.c | 12 +++++-- arch/x86/kernel/cpu/intel_rdt_pseudo_lock.c | 10 ++++++ arch/x86/kernel/cpu/intel_rdt_rdtgroup.c | 38 +++++++++++++++------ 4 files changed, 55 insertions(+), 12 deletions(-)
arch/x86/kernel/cpu/intel_rdt.c +7 -0
@@ -610,6 +610,13 @@ static void domain_remove_cpu(int cpu, struct rdt_resource *r)cancel_delayed_work (&d->cqm_limbo); } +/* +* rdt_domain "d" is going to be freed below, so clear +* its pointer from pseudo_lock_region struct. +*/ +if (d->plr) + d->plr->d =NULL ; +kfree (d->ctrl_val);kfree (d->mbps_val);kfree (d->rmid_busy_llc);
arch/x86/kernel/cpu/intel_rdt_ctrlmondata.c +10 -2
@@ -408,8 +408,16 @@ int rdtgroup_schemata_show(struct kernfs_open_file *of,for_each_alloc_enabled_rdt_resource (r)seq_printf (s,"%s:uninitialized\n" , r->name); }else if (rdtgrp->mode ==RDT_MODE_PSEUDO_LOCKED ) { -seq_printf (s,"%s:%d=%x\n" , rdtgrp->plr->r->name, - rdtgrp->plr->d->id, rdtgrp->plr->cbm); +if (!rdtgrp->plr->d) { +rdt_last_cmd_clear (); +rdt_last_cmd_puts ("Cache domain offline\n" ); + ret = -ENODEV ; + }else { +seq_printf (s,"%s:%d=%x\n" , + rdtgrp->plr->r->name, + rdtgrp->plr->d->id, + rdtgrp->plr->cbm); + } }else { closid = rdtgrp->closid;for_each_alloc_enabled_rdt_resource (r) {
arch/x86/kernel/cpu/intel_rdt_pseudo_lock.c +10 -0
@@ -1116,6 +1116,11 @@ static int pseudo_lock_measure_cycles(struct rdtgroup *rdtgrp, int sel) goto out; } +if (!plr->d) { + ret = -ENODEV ; + goto out; + } + plr->thread_done =0 ; cpu =cpumask_first (&plr->d->cpu_mask);if (!cpu_online (cpu)) {
@@ -1429,6 +1434,11 @@ static int pseudo_lock_dev_mmap(struct file *filp, struct vm_area_struct *vma) plr = rdtgrp->plr; +if (!plr->d) { +mutex_unlock (&rdtgroup_mutex); +return -ENODEV ; + } +/* * Task is required to run with affinity to the cpus associated * with the pseudo-locked region. If this is not the case the task
arch/x86/kernel/cpu/intel_rdt_rdtgroup.c +28 -10
@@ -268,17 +268,27 @@ static int rdtgroup_cpus_show(struct kernfs_open_file *of, struct seq_file *s, void *v) { struct rdtgroup *rdtgrp; +struct cpumask *mask;int ret =0 ; rdtgrp =rdtgroup_kn_lock_live (of->kn);if (rdtgrp) { -if (rdtgrp->mode ==RDT_MODE_PSEUDO_LOCKED ) -seq_printf (s,is_cpu_list (of) ?"%*pbl\n" :"%*pb\n" , -cpumask_pr_args (&rdtgrp->plr->d->cpu_mask)); -else +if (rdtgrp->mode ==RDT_MODE_PSEUDO_LOCKED ) { +if (!rdtgrp->plr->d) { +rdt_last_cmd_clear (); +rdt_last_cmd_puts ("Cache domain offline\n" ); + ret = -ENODEV ; + }else { + mask = &rdtgrp->plr->d->cpu_mask; +seq_printf (s,is_cpu_list (of) ? +"%*pbl\n" :"%*pb\n" , +cpumask_pr_args (mask)); + } + }else {seq_printf (s,is_cpu_list (of) ?"%*pbl\n" :"%*pb\n" ,cpumask_pr_args (&rdtgrp->cpu_mask)); + } }else { ret = -ENOENT ; }
@@ -1180,6 +1190,7 @@ static int rdtgroup_size_show(struct kernfs_open_file *of,struct rdt_resource *r;struct rdt_domain *d;unsigned int size; +int ret =0 ;bool sep;u32 ctrl;
@@ -1190,11 +1201,18 @@ static int rdtgroup_size_show(struct kernfs_open_file *of, }if (rdtgrp->mode ==RDT_MODE_PSEUDO_LOCKED ) { -seq_printf (s,"%*s:" , max_name_width, rdtgrp->plr->r->name); - size =rdtgroup_cbm_to_size (rdtgrp->plr->r, - rdtgrp->plr->d, - rdtgrp->plr->cbm); -seq_printf (s,"%d=%u\n" , rdtgrp->plr->d->id, size); +if (!rdtgrp->plr->d) { +rdt_last_cmd_clear (); +rdt_last_cmd_puts ("Cache domain offline\n" ); + ret = -ENODEV ; + }else { +seq_printf (s,"%*s:" , max_name_width, + rdtgrp->plr->r->name); + size =rdtgroup_cbm_to_size (rdtgrp->plr->r, + rdtgrp->plr->d, + rdtgrp->plr->cbm); +seq_printf (s,"%d=%u\n" , rdtgrp->plr->d->id, size); + } goto out; }
@@ -1224,7 +1242,7 @@ static int rdtgroup_size_show(struct kernfs_open_file *of, out:rdtgroup_kn_unlock (of->kn); -return 0 ; +return ret; }/* rdtgroup information files for one cache resource. */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 89/237 sparc: Fix parport build warnings.
In reply to Sasha LevinFrom: "David S. Miller" <[email protected]>
[ Upstream commit 46b8306480fb424abd525acc1763da1c63a27d8a ]
If PARPORT_PC_FIFO is not enabled, do not provide the dma lock macros and lock definition. Otherwise:
./arch/sparc/include/asm/parport.h:24:24: warning: ‘dma_spin_lock’ defined but not used [-Wunused-variable]
static DEFINE_SPINLOCK(dma_spin_lock);
^~~~~~~~~~~~~./include/linux/spinlock_types.h:81:39: note: in definition of macro ‘DEFINE_SPINLOCK’
#define DEFINE_SPINLOCK(x) spinlock_t x = __SPIN_LOCK_UNLOCKED(x)
--- arch/sparc/include/asm/parport.h | 2 ++ 1 file changed, 2 insertions(+)
arch/sparc/include/asm/parport.h +2 -0
@@ -21,6 +21,7 @@*/ #define HAS_DMA +#ifdef CONFIG_PARPORT_PC_FIFO static DEFINE_SPINLOCK (dma_spin_lock);#define claim_dma_lock () \
@@ -31,6 +32,7 @@ static DEFINE_SPINLOCK(dma_spin_lock);#define release_dma_lock (__flags) \ spin_unlock_irqrestore(&dma_spin_lock, __flags); +#endif static struct sparc_ebus_info { struct ebus_dma_info info;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 90/237 scsi: hisi_sas: Fix NULL pointer dereference
In reply to Sasha LevinFrom: "Gustavo A. R. Silva" <[email protected]>
[ Upstream commit f4445bb93d82a984657b469e63118c2794a4c3d3 ]
There is a NULL pointer dereference in case *slot* happens to be NULL at lines 1053 and 1878:
struct hisi_sas_cq *cq =
&hisi_hba->cq[slot->dlvry_queue];
Notice that *slot* is being NULL checked at lines 1057 and 1881:
if (slot), which implies it may be NULL.
Fix this by placing the declaration and definition of variable cq, which contains the pointer dereference slot->dlvry_queue, after slot has been properly NULL checked.
Addresses-Coverity-ID: 1474515 ("Dereference before null check")
Addresses-Coverity-ID: 1474520 ("Dereference before null check")
--- drivers/scsi/hisi_sas/hisi_sas_main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/scsi/hisi_sas/hisi_sas_main.c +4 -4
@@ -1025,11 +1025,11 @@ static int hisi_sas_exec_internal_tmf_task(struct domain_device *device,if ((task->task_state_flags &SAS_TASK_STATE_ABORTED )) {if (!(task->task_state_flags &SAS_TASK_STATE_DONE )) {struct hisi_sas_slot *slot = task->lldd_task; -struct hisi_sas_cq *cq = - &hisi_hba->cq[slot->dlvry_queue];dev_err (dev,"abort tmf: TMF task timeout and not done\n" );if (slot) { +struct hisi_sas_cq *cq = + &hisi_hba->cq[slot->dlvry_queue];/* * flush tasklet to avoid free'ing task * before using task in IO completion
@@ -1856,10 +1856,10 @@ hisi_sas_internal_task_abort(struct hisi_hba *hisi_hba,if ((task->task_state_flags &SAS_TASK_STATE_ABORTED )) {if (!(task->task_state_flags &SAS_TASK_STATE_DONE )) {struct hisi_sas_slot *slot = task->lldd_task; -struct hisi_sas_cq *cq = - &hisi_hba->cq[slot->dlvry_queue];if (slot) { +struct hisi_sas_cq *cq = + &hisi_hba->cq[slot->dlvry_queue];/* * flush tasklet to avoid free'ing task * before using task in IO completion
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 91/237 powerpc/pseries: Export raw per-CPU VPA data via debugfs
In reply to Sasha LevinFrom: Aravinda Prasad <[email protected]>
[ Upstream commit c6c26fb55e8e4b3fc376be5611685990a17de27a ]
This patch exports the raw per-CPU VPA data via debugfs. A per-CPU file is created which exports the VPA data of that CPU to help debug some of the VPA related issues or to analyze the per-CPU VPA related statistics.
v3: Removed offline CPU check.
v2: Included offline CPU check and other review comments.
--- arch/powerpc/platforms/pseries/lpar.c | 54 +++++++++++++++++++++++++++ 1 file changed, 54 insertions(+)
arch/powerpc/platforms/pseries/lpar.c +54 -0
@@ -48,6 +48,7 @@#include <asm/kexec.h> #include <asm/fadump.h> #include <asm/asm-prototypes.h> +#include <asm/debugfs.h> #include "pseries.h"
@@ -1032,3 +1033,56 @@ static int __init reserve_vrma_context_id(void)return 0 ; }machine_device_initcall (pseries, reserve_vrma_context_id); + +#ifdef CONFIG_DEBUG_FS +/* debugfs file interface for vpa data */ +static ssize_t vpa_file_read (struct file *filp,char __user *buf,size_t len, +loff_t *pos) +{ +int cpu = (long )filp->private_data; +struct lppaca *lppaca = &lppaca_of (cpu); + +return simple_read_from_buffer (buf, len, pos, lppaca, +sizeof (struct lppaca )); +} + +static const struct file_operations vpa_fops = { + .open = simple_open, + .read = vpa_file_read, + .llseek = default_llseek, +}; + +static int __init vpa_debugfs_init (void ) +{ +char name[16 ]; +long i; +static struct dentry *vpa_dir; + +if (!firmware_has_feature (FW_FEATURE_SPLPAR )) +return 0 ; + + vpa_dir =debugfs_create_dir ("vpa" , powerpc_debugfs_root); +if (!vpa_dir) { +pr_warn ("%s: can't create vpa root dir\n" , __func__); +return -ENOMEM ; + } + +/* set up the per-cpu vpa file*/ +for_each_possible_cpu (i) { +struct dentry *d; + +sprintf (name,"cpu-%ld" , i); + + d =debugfs_create_file (name,0400 , vpa_dir, (void *)i, + &vpa_fops); +if (!d) { +pr_warn ("%s: can't create per-cpu vpa file\n" , + __func__); +return -ENOMEM ; + } + } + +return 0 ; +} +machine_arch_initcall (pseries, vpa_debugfs_init); +#endif /* CONFIG_DEBUG_FS */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 92/237 powerpc/mm/radix: Fix off-by-one in split mapping logic
In reply to Sasha LevinFrom: Michael Ellerman <[email protected]>
[ Upstream commit 5c6499b7041b43807dfaeda28aa87fc0e62558f7 ]
When we have CONFIG_STRICT_KERNEL_RWX enabled, we try to split the kernel linear (1:1) mapping so that the kernel text is in a separate page to kernel data, so we can mark the former read-only.
We could achieve that just by always using 64K pages for the linear mapping, but we try to be smarter. Instead we use huge pages when possible, and only switch to smaller pages when necessary.
However we have an off-by-one bug in that logic, which causes us to calculate the wrong boundary between text and data.
For example with the end of the kernel text at 16M we see:
radix-mmu: Mapped 0x0000000000000000-0x0000000001200000 with 64.0 KiB pages
radix-mmu: Mapped 0x0000000001200000-0x0000000040000000 with 2.00 MiB pages
radix-mmu: Mapped 0x0000000040000000-0x0000000100000000 with 1.00 GiB pages
ie. we mapped from 0 to 18M with 64K pages, even though the boundary between text and data is at 16M.
With the fix we see we're correctly hitting the 16M boundary:
radix-mmu: Mapped 0x0000000000000000-0x0000000001000000 with 64.0 KiB pages
radix-mmu: Mapped 0x0000000001000000-0x0000000040000000 with 2.00 MiB pages
radix-mmu: Mapped 0x0000000040000000-0x0000000100000000 with 1.00 GiB pages
--- arch/powerpc/mm/pgtable-radix.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/powerpc/mm/pgtable-radix.c +2 -2
@@ -294,14 +294,14 @@ static int __meminit create_physical_mapping(unsigned long start, }if (split_text_mapping && (mapping_size ==PUD_SIZE ) && - (addr <=__pa_symbol (__init_begin)) && + (addr <__pa_symbol (__init_begin)) && (addr + mapping_size) >=__pa_symbol (_stext)) { max_mapping_size =PMD_SIZE ; goto retry; }if (split_text_mapping && (mapping_size ==PMD_SIZE ) && - (addr <=__pa_symbol (__init_begin)) && + (addr <__pa_symbol (__init_begin)) && (addr + mapping_size) >=__pa_symbol (_stext)) { mapping_size =PAGE_SIZE ; psize = mmu_virtual_psize;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 93/237 powerpc/mm/radix: Fix overuse of small pages in splitting logic
In reply to Sasha LevinFrom: Michael Ellerman <[email protected]>
[ Upstream commit 3b5657ed5b4e27ccf593a41ff3c5aa27dae8df18 ]
When we have CONFIG_STRICT_KERNEL_RWX enabled, we want to split the linear mapping at the text/data boundary so we can map the kernel text read only.
But the current logic uses small pages for the entire text section, regardless of whether a larger page size would fit. eg. with the boundary at 16M we could use 2M pages, but instead we use 64K pages up to the 16M boundary:
Mapped 0x0000000000000000-0x0000000001000000 with 64.0 KiB pages Mapped 0x0000000001000000-0x0000000040000000 with 2.00 MiB pages Mapped 0x0000000040000000-0x0000000100000000 with 1.00 GiB pages
This is because the test is checking if addr is < __init_begin and addr + mapping_size is >= _stext. But that is true for all pages between _stext and __init_begin.
Instead what we want to check is if we are crossing the text/data boundary, which is at __init_begin. With that fixed we see:
Mapped 0x0000000000000000-0x0000000000e00000 with 2.00 MiB pages Mapped 0x0000000000e00000-0x0000000001000000 with 64.0 KiB pages Mapped 0x0000000001000000-0x0000000040000000 with 2.00 MiB pages Mapped 0x0000000040000000-0x0000000100000000 with 1.00 GiB pages
ie. we're correctly using 2MB pages below __init_begin, but we still drop down to 64K pages unnecessarily at the boundary.
--- arch/powerpc/mm/pgtable-radix.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/powerpc/mm/pgtable-radix.c +2 -2
@@ -295,14 +295,14 @@ static int __meminit create_physical_mapping(unsigned long start,if (split_text_mapping && (mapping_size ==PUD_SIZE ) && (addr <__pa_symbol (__init_begin)) && - (addr + mapping_size) >=__pa_symbol (_stext)) { + (addr + mapping_size) >=__pa_symbol (__init_begin)) { max_mapping_size =PMD_SIZE ; goto retry; }if (split_text_mapping && (mapping_size ==PMD_SIZE ) && (addr <__pa_symbol (__init_begin)) && - (addr + mapping_size) >=__pa_symbol (_stext)) { + (addr + mapping_size) >=__pa_symbol (__init_begin)) { mapping_size =PAGE_SIZE ; psize = mmu_virtual_psize; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 94/237 powerpc/mm/radix: Fix small page at boundary when splitting
In reply to Sasha LevinFrom: Michael Ellerman <[email protected]>
[ Upstream commit 81d1b54dec95209ab5e5be2cf37182885f998753 ]
When we have CONFIG_STRICT_KERNEL_RWX enabled, we want to split the linear mapping at the text/data boundary so we can map the kernel text read only.
Currently we always use a small page at the text/data boundary, even when that's not necessary:
Mapped 0x0000000000000000-0x0000000000e00000 with 2.00 MiB pages Mapped 0x0000000000e00000-0x0000000001000000 with 64.0 KiB pages Mapped 0x0000000001000000-0x0000000040000000 with 2.00 MiB pages
This is because the check that the mapping crosses the __init_begin boundary is too strict, it also returns true when we map exactly up to the boundary.
So fix it to check that the mapping would actually map past __init_begin, and with that we see:
Mapped 0x0000000000000000-0x0000000040000000 with 2.00 MiB pages Mapped 0x0000000040000000-0x0000000100000000 with 1.00 GiB pages
--- arch/powerpc/mm/pgtable-radix.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/powerpc/mm/pgtable-radix.c +2 -2
@@ -295,14 +295,14 @@ static int __meminit create_physical_mapping(unsigned long start,if (split_text_mapping && (mapping_size ==PUD_SIZE ) && (addr <__pa_symbol (__init_begin)) && - (addr + mapping_size) >=__pa_symbol (__init_begin)) { + (addr + mapping_size) >__pa_symbol (__init_begin)) { max_mapping_size =PMD_SIZE ; goto retry; }if (split_text_mapping && (mapping_size ==PMD_SIZE ) && (addr <__pa_symbol (__init_begin)) && - (addr + mapping_size) >=__pa_symbol (__init_begin)) { + (addr + mapping_size) >__pa_symbol (__init_begin)) { mapping_size =PAGE_SIZE ; psize = mmu_virtual_psize; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 95/237 powerpc/64s/radix: Fix radix__flush_tlb_collapsed_pmd double flushing pmd
In reply to Sasha LevinFrom: Nicholas Piggin <[email protected]>
[ Upstream commit dd76ff5af35350fd6d5bb5b069e73b6017f66893 ]
--- arch/powerpc/mm/tlb-radix.c | 1 - 1 file changed, 1 deletion(-)
arch/powerpc/mm/tlb-radix.c +0 -1
@@ -1071,7 +1071,6 @@ void radix__flush_tlb_collapsed_pmd(struct mm_struct *mm, unsigned long addr) goto local; }_tlbie_va_range (addr, end, pid,PAGE_SIZE , mmu_virtual_psize, true); - goto local; }else { local:_tlbiel_va_range (addr, end, pid,PAGE_SIZE , mmu_virtual_psize, true);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 96/237 selftests/bpf: fix return value comparison for tests in test_libbpf.sh
In reply to Sasha LevinFrom: Quentin Monnet <[email protected]>
[ Upstream commit c5fa5d602221362f8341ecd9e32d83194abf5bd9 ]
The return value for each test in test_libbpf.sh is compared with
if (( $? == 0 )) ; then ...
This works well with bash, but not with dash, that /bin/sh is aliased to on some systems (such as Ubuntu).
Let's replace this comparison by something that works on both shells.
--- tools/testing/selftests/bpf/test_libbpf.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/bpf/test_libbpf.sh +1 -1
@@ -6,7 +6,7 @@ export TESTNAME=test_libbpf # Determine selftest success via shell exit code exit_handler() { - if (( $? == 0 )); then + if [ $? -eq 0 ]; then echo "selftests: $TESTNAME [PASS]"; else echo "$TESTNAME: failed at file $LAST_LOADED" 1>&2
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 97/237 tools: bpftool: fix completion for "bpftool map update"
In reply to Sasha LevinFrom: Quentin Monnet <[email protected]>
[ Upstream commit fe8ecccc10b3adc071de05ca7af728ca1a4ac9aa ]
When trying to complete "bpftool map update" commands, the call to printf would print an error message that would show on the command line if no map is found to complete the command line.
Fix it by making sure we have map ids to complete the line with, before we try to print something.
--- tools/bpf/bpftool/bash-completion/bpftool | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/bpf/bpftool/bash-completion/bpftool +1 -1
@@ -143,7 +143,7 @@ _bpftool_map_update_map_type() local type type=$(bpftool -jp map show $keyword $ref | \ command sed -n 's/.*"type": "\(.*\)",$/\1/p') - printf $type + [[ -n $type ]] && printf $type } _bpftool_map_update_get_id()
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 98/237 ceph: fix dentry leak in ceph_readdir_prepopulate
In reply to Sasha LevinFrom: "Yan, Zheng" <[email protected]>
[ Upstream commit c58f450bd61511d897efc2ea472c69630635b557 ]
--- fs/ceph/inode.c | 1 - 1 file changed, 1 deletion(-)
fs/ceph/inode.c +0 -1
@@ -1694,7 +1694,6 @@ int ceph_readdir_prepopulate(struct ceph_mds_request *req,if (IS_ERR (realdn)) { err =PTR_ERR (realdn);d_drop (dn); - dn =NULL ; goto next_item; } dn = realdn;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 99/237 ceph: only allow punch hole mode in fallocate
In reply to Sasha LevinFrom: Luis Henriques <[email protected]>
[ Upstream commit bddff633ab7bc60a18a86ac8b322695b6f8594d0 ]
Current implementation of cephfs fallocate isn't correct as it doesn't really reserve the space in the cluster, which means that a subsequent call to a write may actually fail due to lack of space. In fact, it is currently possible to fallocate an amount space that is larger than the free space in the cluster. It has behaved this way since the initial commit ad7a60de882a ("ceph: punch hole support").
Since there's no easy solution to fix this at the moment, this patch simply removes support for all fallocate operations but FALLOC_FL_PUNCH_HOLE (which implies FALLOC_FL_KEEP_SIZE).
--- fs/ceph/file.c | 45 +++++++++------------------------------------ 1 file changed, 9 insertions(+), 36 deletions(-)
fs/ceph/file.c +9 -36
@@ -1735,7 +1735,6 @@ static long ceph_fallocate(struct file *file, int mode,struct ceph_file_info *fi = file->private_data;struct inode *inode =file_inode (file);struct ceph_inode_info *ci =ceph_inode (inode); -struct ceph_fs_client *fsc =ceph_inode_to_client (inode);struct ceph_cap_flush *prealloc_cf;int want, got =0 ;int dirty;
@@ -1743,10 +1742,7 @@ static long ceph_fallocate(struct file *file, int mode,loff_t endoff =0 ;loff_t size; -if ((offset + length) >max (i_size_read (inode), fsc->max_file_size)) -return -EFBIG ; - -if (mode & ~(FALLOC_FL_KEEP_SIZE |FALLOC_FL_PUNCH_HOLE )) +if (mode != (FALLOC_FL_KEEP_SIZE |FALLOC_FL_PUNCH_HOLE ))return -EOPNOTSUPP ;if (!S_ISREG (inode->i_mode))
@@ -1763,18 +1759,6 @@ static long ceph_fallocate(struct file *file, int mode, goto unlock; } -if (!(mode & (FALLOC_FL_PUNCH_HOLE |FALLOC_FL_KEEP_SIZE )) && -ceph_quota_is_max_bytes_exceeded (inode, offset + length)) { - ret = -EDQUOT ; - goto unlock; - } - -if (ceph_osdmap_flag (&fsc->client->osdc,CEPH_OSDMAP_FULL ) && - !(mode &FALLOC_FL_PUNCH_HOLE )) { - ret = -ENOSPC ; - goto unlock; - } -if (ci->i_inline_version !=CEPH_INLINE_NONE ) { ret =ceph_uninline_data (file,NULL );if (ret <0 )
@@ -1782,12 +1766,12 @@ static long ceph_fallocate(struct file *file, int mode, } size =i_size_read (inode); -if (!(mode &FALLOC_FL_KEEP_SIZE )) { - endoff = offset + length; - ret =inode_newsize_ok (inode, endoff); -if (ret) - goto unlock; - } + +/* Are we punching a hole beyond EOF? */ +if (offset >= size) + goto unlock; +if ((offset + length) > size) + length = size - offset;if (fi->fmode &CEPH_FILE_MODE_LAZY ) want =CEPH_CAP_FILE_BUFFER |CEPH_CAP_FILE_LAZYIO ;
@@ -1798,16 +1782,8 @@ static long ceph_fallocate(struct file *file, int mode,if (ret <0 ) goto unlock; -if (mode &FALLOC_FL_PUNCH_HOLE ) { -if (offset < size) -ceph_zero_pagecache_range (inode, offset, length); - ret =ceph_zero_objects (inode, offset, length); - }else if (endoff > size) { -truncate_pagecache_range (inode, size,-1 ); -if (ceph_inode_set_size (inode, endoff)) -ceph_check_caps (ceph_inode (inode), -CHECK_CAPS_AUTHONLY ,NULL ); - } +ceph_zero_pagecache_range (inode, offset, length); + ret =ceph_zero_objects (inode, offset, length);if (!ret) {spin_lock (&ci->i_ceph_lock);
@@ -1817,9 +1793,6 @@ static long ceph_fallocate(struct file *file, int mode,spin_unlock (&ci->i_ceph_lock);if (dirty)__mark_inode_dirty (inode, dirty); -if ((endoff > size) && -ceph_quota_is_max_bytes_approaching (inode, endoff)) -ceph_check_caps (ci,CHECK_CAPS_NODELAY ,NULL ); }ceph_put_cap_refs (ci, got);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 100/237 libceph: don't consume a ref on pagelist in ceph_msg_data_add_pagelist()
In reply to Sasha LevinFrom: Ilya Dryomov <[email protected]>
[ Upstream commit 894868330a1e038ea4a65dbb81741eef70ad71b1 ]
Because send_mds_reconnect() wants to send a message with a pagelist and pass the ownership to the messenger, ceph_msg_data_add_pagelist() consumes a ref which is then put in ceph_msg_data_destroy(). This makes managing pagelists in the OSD client (where they are wrapped in ceph_osd_data) unnecessarily hard because the handoff only happens in ceph_osdc_start_request() instead of when the pagelist is passed to ceph_osd_data_pagelist_init(). I counted several memory leaks on various error paths.
Fix up ceph_msg_data_add_pagelist() and carry a pagelist ref in ceph_osd_data.
--- fs/ceph/mds_client.c | 2 +- net/ceph/messenger.c | 1 + net/ceph/osd_client.c | 8 ++++++++ 3 files changed, 10 insertions(+), 1 deletion(-)
fs/ceph/mds_client.c +1 -1
@@ -2184,7 +2184,6 @@ static struct ceph_msg *create_request_message(struct ceph_mds_client *mdsc,if (req->r_pagelist) {struct ceph_pagelist *pagelist = req->r_pagelist; -refcount_inc (&pagelist->refcnt);ceph_msg_data_add_pagelist (msg, pagelist); msg->hdr.data_len =cpu_to_le32 (pagelist->length); }else {
@@ -3289,6 +3288,7 @@ static void send_mds_reconnect(struct ceph_mds_client *mdsc,mutex_unlock (&mdsc->mutex);up_read (&mdsc->snap_rwsem); +ceph_pagelist_release (pagelist);return ; fail:
net/ceph/messenger.c +1 -0
@@ -3323,6 +3323,7 @@ void ceph_msg_data_add_pagelist(struct ceph_msg *msg, data =ceph_msg_data_create (CEPH_MSG_DATA_PAGELIST );BUG_ON (!data); +refcount_inc (&pagelist->refcnt); data->pagelist = pagelist;list_add_tail (&data->links, &msg->data);
net/ceph/osd_client.c +8 -0
@@ -126,6 +126,9 @@ static void ceph_osd_data_init(struct ceph_osd_data *osd_data) osd_data->type =CEPH_OSD_DATA_TYPE_NONE ; } +/* +* Consumes @pages if @own_pages is true. +*/ static void ceph_osd_data_pages_init (struct ceph_osd_data *osd_data,struct page **pages,u64 length,u32 alignment,bool pages_from_pool,bool own_pages)
@@ -138,6 +141,9 @@ static void ceph_osd_data_pages_init(struct ceph_osd_data *osd_data, osd_data->own_pages = own_pages; } +/* +* Consumes a ref on @pagelist. +*/ static void ceph_osd_data_pagelist_init (struct ceph_osd_data *osd_data,struct ceph_pagelist *pagelist) {
@@ -362,6 +368,8 @@ static void ceph_osd_data_release(struct ceph_osd_data *osd_data) num_pages =calc_pages_for ((u64 )osd_data->alignment, (u64 )osd_data->length);ceph_release_page_vector (osd_data->pages, num_pages); + }else if (osd_data->type ==CEPH_OSD_DATA_TYPE_PAGELIST ) { +ceph_pagelist_release (osd_data->pagelist); }ceph_osd_data_init (osd_data); }
Signature · 1 line
2.20.1
Re: [PATCH AUTOSEL 4.19 100/237] libceph: don't consume a ref on pagelist in ceph_msg_data_add_pagelist()
Quoted 82 lines · Sasha Levin
From: Ilya Dryomov <[email protected]>
[ Upstream commit
894868330a1e038ea4a65dbb81741eef70ad71b1]Because
send_mds_reconnect()wants to send a message with a pagelist and pass the ownership to the messenger,ceph_msg_data_add_pagelist()consumes a ref which is then put inceph_msg_data_destroy(). This makes managing pagelists in the OSD client (where they are wrapped inceph_osd_data) unnecessarily hard because the handoff only happens inceph_osdc_start_request()instead of when the pagelist is passed toceph_osd_data_pagelist_init(). I counted several memory leaks on various error paths.Fix up
ceph_msg_data_add_pagelist()and carry a pagelist ref inceph_osd_data.Signed-off-by Ilya Dryomov <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- fs/ceph/mds_client.c | 2 +- net/ceph/messenger.c | 1 + net/ceph/osd_client.c | 8 ++++++++ 3 files changed, 10 insertions(+), 1 deletion(-)fs/ceph/mds_client.c +1
-1@@ -2184,7 +2184,6 @@ static struct ceph_msg *create_request_message(struct ceph_mds_client *mdsc,if (req->r_pagelist) {struct ceph_pagelist *pagelist = req->r_pagelist; -refcount_inc (&pagelist->refcnt);ceph_msg_data_add_pagelist (msg, pagelist); msg->hdr.data_len =cpu_to_le32 (pagelist->length); }else {@@ -3289,6 +3288,7 @@ static void send_mds_reconnect(struct ceph_mds_client *mdsc,mutex_unlock (&mdsc->mutex);up_read (&mdsc->snap_rwsem); +ceph_pagelist_release (pagelist);return ; fail:net/ceph/messenger.c +1
-0@@ -3323,6 +3323,7 @@ void ceph_msg_data_add_pagelist(struct ceph_msg *msg, data =ceph_msg_data_create (CEPH_MSG_DATA_PAGELIST );BUG_ON (!data); +refcount_inc (&pagelist->refcnt); data->pagelist = pagelist;list_add_tail (&data->links, &msg->data);net/ceph/osd_client.c +6
-0@@ -126,6 +126,9 @@ static void ceph_osd_data_init(struct ceph_osd_data *osd_data) osd_data->type =CEPH_OSD_DATA_TYPE_NONE ; } +/* +* Consumes @pages if @own_pages is true. +*/ static void ceph_osd_data_pages_init (struct ceph_osd_data *osd_data,struct page **pages,u64 length,u32 alignment,bool pages_from_pool,bool own_pages)@@ -138,6 +141,9 @@ static void ceph_osd_data_pages_init(struct ceph_osd_data *osd_data, osd_data->own_pages = own_pages; } +/* +* Consumes a ref on @pagelist. +*/ static void ceph_osd_data_pagelist_init (struct ceph_osd_data *osd_data,struct ceph_pagelist *pagelist) {
net/ceph/osd_client.c static void ceph_osd_data_release(struct ceph_osd_data *osd_data) · line 375
Quoted 8 lines
net/ceph/osd_client.c +2
-0@@ -362,6 +368,8 @@ static void ceph_osd_data_release(struct ceph_osd_data *osd_data) num_pages =calc_pages_for ((u64 )osd_data->alignment, (u64 )osd_data->length);ceph_release_page_vector (osd_data->pages, num_pages); + }else if (osd_data->type ==CEPH_OSD_DATA_TYPE_PAGELIST ) { +ceph_pagelist_release (osd_data->pagelist); }ceph_osd_data_init (osd_data); }
Hi Sasha,
This commit was part of a larger series and shouldn't be backported on its own. Please drop it.
Thanks,
Ilya
Sasha Levin
maintainerRe: [PATCH AUTOSEL 4.19 100/237] libceph: don't consume a ref on pagelist in ceph_msg_data_add_pagelist()
Quoted 94 lines · Ilya Dryomov
Quoted 82 lines · Sasha Levin
From: Ilya Dryomov <[email protected]>
[ Upstream commit
894868330a1e038ea4a65dbb81741eef70ad71b1]Because
send_mds_reconnect()wants to send a message with a pagelist and pass the ownership to the messenger,ceph_msg_data_add_pagelist()consumes a ref which is then put inceph_msg_data_destroy(). This makes managing pagelists in the OSD client (where they are wrapped inceph_osd_data) unnecessarily hard because the handoff only happens inceph_osdc_start_request()instead of when the pagelist is passed toceph_osd_data_pagelist_init(). I counted several memory leaks on various error paths.Fix up
ceph_msg_data_add_pagelist()and carry a pagelist ref inceph_osd_data.Signed-off-by Ilya Dryomov <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- fs/ceph/mds_client.c | 2 +- net/ceph/messenger.c | 1 + net/ceph/osd_client.c | 8 ++++++++ 3 files changed, 10 insertions(+), 1 deletion(-)fs/ceph/mds_client.c +1
-1@@ -2184,7 +2184,6 @@ static struct ceph_msg *create_request_message(struct ceph_mds_client *mdsc,if (req->r_pagelist) {struct ceph_pagelist *pagelist = req->r_pagelist; -refcount_inc (&pagelist->refcnt);ceph_msg_data_add_pagelist (msg, pagelist); msg->hdr.data_len =cpu_to_le32 (pagelist->length); }else {@@ -3289,6 +3288,7 @@ static void send_mds_reconnect(struct ceph_mds_client *mdsc,mutex_unlock (&mdsc->mutex);up_read (&mdsc->snap_rwsem); +ceph_pagelist_release (pagelist);return ; fail:net/ceph/messenger.c +1
-0@@ -3323,6 +3323,7 @@ void ceph_msg_data_add_pagelist(struct ceph_msg *msg, data =ceph_msg_data_create (CEPH_MSG_DATA_PAGELIST );BUG_ON (!data); +refcount_inc (&pagelist->refcnt); data->pagelist = pagelist;list_add_tail (&data->links, &msg->data);net/ceph/osd_client.c +6
-0@@ -126,6 +126,9 @@ static void ceph_osd_data_init(struct ceph_osd_data *osd_data) osd_data->type =CEPH_OSD_DATA_TYPE_NONE ; } +/* +* Consumes @pages if @own_pages is true. +*/ static void ceph_osd_data_pages_init (struct ceph_osd_data *osd_data,struct page **pages,u64 length,u32 alignment,bool pages_from_pool,bool own_pages)@@ -138,6 +141,9 @@ static void ceph_osd_data_pages_init(struct ceph_osd_data *osd_data, osd_data->own_pages = own_pages; } +/* +* Consumes a ref on @pagelist. +*/ static void ceph_osd_data_pagelist_init (struct ceph_osd_data *osd_data,struct ceph_pagelist *pagelist) {net/ceph/osd_client.c static void ceph_osd_data_release(struct ceph_osd_data *osd_data) · line 375
Quoted 8 lines
net/ceph/osd_client.c +2
-0@@ -362,6 +368,8 @@ static void ceph_osd_data_release(struct ceph_osd_data *osd_data) num_pages =calc_pages_for ((u64 )osd_data->alignment, (u64 )osd_data->length);ceph_release_page_vector (osd_data->pages, num_pages); + }else if (osd_data->type ==CEPH_OSD_DATA_TYPE_PAGELIST ) { +ceph_pagelist_release (osd_data->pagelist); }ceph_osd_data_init (osd_data); }Hi Sasha,
Quoted 2 lines
This commit was part of a larger series and shouldn't be backported on its own. Please drop it.
Dropped, thanks!
Signature · 2 lines
Thanks, Sasha
Sasha Levin
maintainerPATCH 101/237 rtc: s35390a: Change buf's type to u8 in s35390a_init
In reply to Sasha LevinFrom: Nathan Chancellor <[email protected]>
[ Upstream commit ef0f02fd69a02b50e468a4ddbe33e3d81671e248 ]
Clang warns:
drivers/rtc/rtc-s35390a.c:124:27: warning: implicit conversion from 'int' to 'char' changes value from 192 to -64 [-Wconstant-conversion]
buf = S35390A_FLAG_RESET | S35390A_FLAG_24H;
~ ~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~1 warning generated.
Update buf to be an unsigned 8-bit integer, which matches the buf member in struct i2c_msg.
https://github.com/ClangBuiltLinux/linux/issues/145
--- drivers/rtc/rtc-s35390a.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/rtc/rtc-s35390a.c +1 -1
@@ -108,7 +108,7 @@ static int s35390a_get_reg(struct s35390a *s35390a, int reg, char *buf, int len)static int s35390a_init (struct s35390a *s35390a) { -char buf; +u8 buf;int ret;unsigned initcount =0 ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 102/237 RISC-V: Avoid corrupting the upper 32-bit of phys_addr_t in ioremap
In reply to Sasha LevinFrom: Vincent Chen <[email protected]>
[ Upstream commit 827a438156e4c423b6875a092e272933952a2910 ]
For 32bit, the upper 32-bit of phys_addr_t will be flushed to zero after AND with PAGE_MASK because the data type of PAGE_MASK is unsigned long. To fix this problem, the page alignment is done by subtracting the page offset instead of AND with PAGE_MASK.
--- arch/riscv/mm/ioremap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/riscv/mm/ioremap.c +1 -1
@@ -42,7 +42,7 @@ static void __iomem *__ioremap_caller(phys_addr_t addr, size_t size,/* Page-align mappings */ offset = addr & (~PAGE_MASK ); - addr &=PAGE_MASK ; + addr -= offset; size =PAGE_ALIGN (size + offset); area =get_vm_area_caller (size,VM_IOREMAP , caller);
Signature · 7 lines
2.20.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
Sasha Levin
maintainerPATCH 103/237 thermal: armada: fix a test in probe()
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit d1d2c290b3c04b65fa6132eeebe50a070746d8f6 ]
The platform_get_resource() function doesn't return error pointers, it returns NULL on error.
--- drivers/thermal/armada_thermal.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/thermal/armada_thermal.c +2 -2
@@ -526,8 +526,8 @@ static int armada_thermal_probe_legacy(struct platform_device *pdev,/* First memory region points towards the status register */ res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); -if (IS_ERR (res)) -return PTR_ERR (res); +if (!res) +return -EIO ;/* * Edit the resource start address and length to map over all the
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 104/237 f2fs: fix to spread clear_cold_data()
In reply to Sasha LevinFrom: Chao Yu <[email protected]>
[ Upstream commit 2baf07818549c8bb8d7b3437e889b86eab56d38e ]
We need to drop PG_checked flag on page as well when we clear PG_uptodate flag, in order to avoid treating the page as GCing one later.
--- fs/f2fs/data.c | 8 +++++++- fs/f2fs/dir.c | 1 + fs/f2fs/segment.c | 4 +++- 3 files changed, 11 insertions(+), 2 deletions(-)
fs/f2fs/data.c +7 -1
@@ -1775,6 +1775,7 @@ int f2fs_do_write_data_page(struct f2fs_io_info *fio)/* This page is already truncated */ if (fio->old_blkaddr ==NULL_ADDR ) {ClearPageUptodate (page); +clear_cold_data (page); goto out_writepage; } got_it:
@@ -1950,8 +1951,10 @@ static int __write_data_page(struct page *page, bool *submitted, out:inode_dec_dirty_pages (inode); -if (err) +if (err) {ClearPageUptodate (page); +clear_cold_data (page); + }if (wbc->for_reclaim) {f2fs_submit_merged_write_cond (sbi, inode,0 , page->index,DATA );
@@ -2570,6 +2573,8 @@ void f2fs_invalidate_page(struct page *page, unsigned int offset, } } +clear_cold_data (page); +/* This is atomic written page, keep Private */ if (IS_ATOMIC_WRITTEN_PAGE (page))return f2fs_drop_inmem_page (inode, page);
@@ -2588,6 +2593,7 @@ int f2fs_release_page(struct page *page, gfp_t wait)if (IS_ATOMIC_WRITTEN_PAGE (page))return 0 ; +clear_cold_data (page);set_page_private (page,0 );ClearPagePrivate (page);return 1 ;
fs/f2fs/dir.c +1 -0
@@ -733,6 +733,7 @@ void f2fs_delete_entry(struct f2fs_dir_entry *dentry, struct page *page,clear_page_dirty_for_io (page);ClearPagePrivate (page);ClearPageUptodate (page); +clear_cold_data (page);inode_dec_dirty_pages (dir);f2fs_remove_dirty_inode (dir); }
fs/f2fs/segment.c +3 -1
@@ -277,8 +277,10 @@ static int __revoke_inmem_pages(struct inode *inode, } next:/* we don't need to invalidate this in the sccessful status */ -if (drop || recover) +if (drop || recover) {ClearPageUptodate (page); +clear_cold_data (page); + }set_page_private (page,0 );ClearPagePrivate (page);f2fs_put_page (page,1 );
Signature · 8 lines
2.20.1 _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Sasha Levin
maintainerPATCH 105/237 f2fs: spread f2fs_set_inode_flags()
In reply to Sasha LevinFrom: Chao Yu <[email protected]>
[ Upstream commit 9149a5eb606152df158eb7d7da5a34e84b574189 ]
This patch changes codes as below:
- use f2fs_set_inode_flags() to update i_flags atomically to avoid potential race.
- synchronize F2FS_I(inode)->i_flags to inode->i_flags in f2fs_new_inode().
- use f2fs_set_inode_flags() to simply codes in f2fs_quota_{on,off}.
--- fs/f2fs/f2fs.h | 2 +- fs/f2fs/namei.c | 2 ++ fs/f2fs/super.c | 5 ++--- 3 files changed, 5 insertions(+), 4 deletions(-)
fs/f2fs/f2fs.h +1 -1
@@ -3387,7 +3387,7 @@ static inline void f2fs_set_encrypted_inode(struct inode *inode) {#ifdef CONFIG_F2FS_FS_ENCRYPTION file_set_encrypt (inode); - inode->i_flags |=S_ENCRYPTED ; +f2fs_set_inode_flags (inode);#endif }
fs/f2fs/namei.c +2 -0
@@ -124,6 +124,8 @@ static struct inode *f2fs_new_inode(struct inode *dir, umode_t mode)if (F2FS_I (inode)->i_flags &F2FS_PROJINHERIT_FL )set_inode_flag (inode,FI_PROJ_INHERIT ); +f2fs_set_inode_flags (inode); +trace_f2fs_new_inode (inode,0 );return inode;
fs/f2fs/super.c +2 -3
@@ -1835,8 +1835,7 @@ static int f2fs_quota_on(struct super_block *sb, int type, int format_id,inode_lock (inode);F2FS_I (inode)->i_flags |=F2FS_NOATIME_FL |F2FS_IMMUTABLE_FL ; -inode_set_flags (inode,S_NOATIME |S_IMMUTABLE , -S_NOATIME |S_IMMUTABLE ); +f2fs_set_inode_flags (inode);inode_unlock (inode);f2fs_mark_inode_dirty_sync (inode, false);
@@ -1861,7 +1860,7 @@ static int f2fs_quota_off(struct super_block *sb, int type)inode_lock (inode);F2FS_I (inode)->i_flags &= ~(F2FS_NOATIME_FL |F2FS_IMMUTABLE_FL ); -inode_set_flags (inode,0 ,S_NOATIME |S_IMMUTABLE ); +f2fs_set_inode_flags (inode);inode_unlock (inode);f2fs_mark_inode_dirty_sync (inode, false); out_put:
Signature · 8 lines
2.20.1 _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Sasha Levin
maintainerPATCH 106/237 mISDN: Fix type of switch control variable in ctrl_teimanager
In reply to Sasha LevinFrom: Nathan Chancellor <[email protected]>
[ Upstream commit aeb5e02aca91522733eb1db595ac607d30c87767 ]
Clang warns (trimmed for brevity):
drivers/isdn/mISDN/tei.c:1193:7: warning: overflow converting case value to switch condition type (2147764552 to 18446744071562348872) [-Wswitch]
case IMHOLD_L1:
^
drivers/isdn/mISDN/tei.c:1187:7: warning: overflow converting case value
to switch condition type (2147764550 to 18446744071562348870) [-Wswitch]
case IMCLEAR_L2:
^2 warnings generated.
The root cause is that the _IOC macro can generate really large numbers, which don't find into type int. My research into how GCC and Clang are handling this at a low level didn't prove fruitful and surveying the kernel tree shows that aside from here and a few places in the scsi subsystem, everything that uses _IOC is at least of type 'unsigned int'. Make that change here because as nothing in this function cares about the signedness of the variable and it removes ambiguity, which is never good when dealing with compilers.
While we're here, remove the unnecessary local variable ret (just return -EINVAL and 0 directly).
--- drivers/isdn/mISDN/tei.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/isdn/mISDN/tei.c +3 -4
@@ -1180,8 +1180,7 @@ static int ctrl_teimanager(struct manager *mgr, void *arg) {/* currently we only have one option */ - int *val = (int *)arg; -int ret =0 ; +unsigned int *val = (unsigned int *)arg;switch (val[0 ]) {case IMCLEAR_L2 :
@@ -1197,9 +1196,9 @@ ctrl_teimanager(struct manager *mgr, void *arg)test_and_clear_bit (OPTION_L1_HOLD , &mgr->options);break ;default : - ret = -EINVAL ; +return -EINVAL ; } -return ret; +return 0 ; }/* This function does create a L2 for fixed TEI in NT Mode */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 107/237 qlcnic: fix a return in qlcnic_dcb_get_capability()
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit c94f026fb742b2d3199422751dbc4f6fc0e753d8 ]
These functions are supposed to return one on failure and zero on success. Returning a zero here could cause uninitialized variable bugs in several of the callers. For example:
drivers/scsi/cxgbi/cxgb4i/cxgb4i.c:1660 get_iscsi_dcb_priority()
error: uninitialized symbol 'caps'.
--- drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.c +1 -1
@@ -883,7 +883,7 @@ static u8 qlcnic_dcb_get_capability(struct net_device *netdev, int capid,struct qlcnic_adapter *adapter =netdev_priv (netdev);if (!test_bit (QLCNIC_DCB_STATE , &adapter->dcb->state)) -return 0 ; +return 1 ;switch (capid) {case DCB_CAP_ATTR_PG :
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 108/237 net: ethernet: ti: cpsw: unsync mcast entries while switch promisc mode
In reply to Sasha LevinFrom: Ivan Khoronzhuk <[email protected]>
[ Upstream commit 9737cc99dd14b5b8b9d267618a6061feade8ea68 ]
After flushing all mcast entries from the table, the ones contained in mc list of ndev are not restored when promisc mode is toggled off, because they are considered as synched with ALE, thus, in order to restore them after promisc mode - reset syncing info. This fix touches only switch mode devices, including single port boards like Beagle Bone.
("net: ethernet: ti: cpsw: fix lost of mcast packets while rx_mode update")
--- drivers/net/ethernet/ti/cpsw.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/ti/cpsw.c +1 -0
@@ -642,6 +642,7 @@ static void cpsw_set_promiscious(struct net_device *ndev, bool enable)/* Clear all mcast from ALE */ cpsw_ale_flush_multicast (ale,ALE_ALL_PORTS ,-1 ); +__dev_mc_unsync (ndev,NULL );/* Flood All Unicast Packets to Host port */ cpsw_ale_control_set (ale,0 ,ALE_P0_UNI_FLOOD ,1 );
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 109/237 mfd: arizona: Correct calling of runtime_put_sync
In reply to Sasha LevinFrom: Sapthagiri Baratam <[email protected]>
[ Upstream commit 6b269a41a4520f7eb639e61a45ebbb9c9267d5e0 ]
Don't call runtime_put_sync when clk32k_ref is ARIZONA_32KZ_MCLK2 as there is no corresponding runtime_get_sync call.
MCLK1 is not in the AoD power domain so if it is used as 32kHz clock source we need to hold a runtime PM reference to keep the device from going into low power mode.
--- drivers/mfd/arizona-core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/mfd/arizona-core.c +4 -4
@@ -52,8 +52,10 @@ int arizona_clk32k_enable(struct arizona *arizona)if (ret !=0 ) goto err_ref; ret =clk_prepare_enable (arizona->mclk[ARIZONA_MCLK1 ]); -if (ret !=0 ) - goto err_pm; +if (ret !=0 ) { +pm_runtime_put_sync (arizona->dev); + goto err_ref; + }break ;case ARIZONA_32KZ_MCLK2 : ret =clk_prepare_enable (arizona->mclk[ARIZONA_MCLK2 ]);
@@ -67,8 +69,6 @@ int arizona_clk32k_enable(struct arizona *arizona) ARIZONA_CLK_32K_ENA); } -err_pm: -pm_runtime_put_sync (arizona->dev); err_ref:if (ret !=0 ) arizona->clk32k_ref--;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 110/237 mfd: mc13xxx-core: Fix PMIC shutdown when reading ADC values
In reply to Sasha LevinFrom: Fabio Estevam <[email protected]>
[ Upstream commit 55143439b7b501882bea9d95a54adfe00ffc79a3 ]
When trying to read any MC13892 ADC channel on a imx51-babbage board:
The MC13892 PMIC shutdowns completely.
After debugging this issue and comparing the MC13892 and MC13783 initializations done in the vendor kernel, it was noticed that the CHRGRAWDIV bit of the ADC0 register was not being set.
This bit is set by default after power on, but the driver was clearing it.
After setting this bit it is possible to read the ADC values correctly.
--- drivers/mfd/mc13xxx-core.c | 3 ++- include/linux/mfd/mc13xxx.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-)
drivers/mfd/mc13xxx-core.c +2 -1
@@ -278,7 +278,8 @@ int mc13xxx_adc_do_conversion(struct mc13xxx *mc13xxx, unsigned int mode,if (ret) goto out; - adc0 =MC13XXX_ADC0_ADINC1 |MC13XXX_ADC0_ADINC2 ; + adc0 =MC13XXX_ADC0_ADINC1 |MC13XXX_ADC0_ADINC2 | +MC13XXX_ADC0_CHRGRAWDIV ; adc1 =MC13XXX_ADC1_ADEN |MC13XXX_ADC1_ADTRIGIGN |MC13XXX_ADC1_ASC ;/*
include/linux/mfd/mc13xxx.h +1 -0
@@ -249,6 +249,7 @@ struct mc13xxx_platform_data {#define MC13XXX_ADC0_TSMOD0 (1 << 12)#define MC13XXX_ADC0_TSMOD1 (1 << 13)#define MC13XXX_ADC0_TSMOD2 (1 << 14) +#define MC13XXX_ADC0_CHRGRAWDIV (1 << 15)#define MC13XXX_ADC0_ADINC1 (1 << 16)#define MC13XXX_ADC0_ADINC2 (1 << 17)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 111/237 mfd: intel_soc_pmic_bxtwc: Chain power button IRQs as well
In reply to Sasha LevinFrom: Andy Shevchenko <[email protected]>
[ Upstream commit 9f8ddee1dab836ca758ca8fc555ab5a3aaa5d3fd ]
Power button IRQ actually has a second level of interrupts to distinguish between UI and POWER buttons. Moreover, current implementation looks awkward in approach to handle second level IRQs by first level related IRQ chip.
To address above issues, split power button IRQ to be chained as well.
--- drivers/mfd/intel_soc_pmic_bxtwc.c | 41 ++++++++++++++++++++++-------- include/linux/mfd/intel_soc_pmic.h | 1 + 2 files changed, 32 insertions(+), 10 deletions(-)
drivers/mfd/intel_soc_pmic_bxtwc.c +31 -10
@@ -31,8 +31,8 @@/* Interrupt Status Registers */ #define BXTWC_IRQLVL1 0x4E02 -#define BXTWC_PWRBTNIRQ 0x4E03 +#define BXTWC_PWRBTNIRQ 0x4E03#define BXTWC_THRM0IRQ 0x4E04#define BXTWC_THRM1IRQ 0x4E05#define BXTWC_THRM2IRQ 0x4E06
@@ -47,10 +47,9 @@/* Interrupt MASK Registers */ #define BXTWC_MIRQLVL1 0x4E0E -#define BXTWC_MPWRTNIRQ 0x4E0F -#define BXTWC_MIRQLVL1_MCHGR BIT(5) +#define BXTWC_MPWRBTNIRQ 0x4E0F#define BXTWC_MTHRM0IRQ 0x4E12#define BXTWC_MTHRM1IRQ 0x4E13#define BXTWC_MTHRM2IRQ 0x4E14
@@ -66,9 +65,7 @@/* Whiskey Cove PMIC share same ACPI ID between different platforms */ #define BROXTON_PMIC_WC_HRV 4 -/* Manage in two IRQ chips since mask registers are not consecutive */ enum bxtwc_irqs { -/* Level 1 */ BXTWC_PWRBTN_LVL1_IRQ =0 ,BXTWC_TMU_LVL1_IRQ ,BXTWC_THRM_LVL1_IRQ ,
@@ -77,9 +74,11 @@ enum bxtwc_irqs {BXTWC_CHGR_LVL1_IRQ ,BXTWC_GPIO_LVL1_IRQ , BXTWC_CRIT_LVL1_IRQ, +}; -/* Level 2 */ - BXTWC_PWRBTN_IRQ, +enum bxtwc_irqs_pwrbtn { +BXTWC_PWRBTN_IRQ =0 , +BXTWC_UIBTN_IRQ , }; enum bxtwc_irqs_bcu {
@@ -113,7 +112,10 @@ static const struct regmap_irq bxtwc_regmap_irqs[] = {REGMAP_IRQ_REG (BXTWC_CHGR_LVL1_IRQ ,0 ,BIT (5 )),REGMAP_IRQ_REG (BXTWC_GPIO_LVL1_IRQ ,0 ,BIT (6 )), REGMAP_IRQ_REG(BXTWC_CRIT_LVL1_IRQ, 0, BIT(7)), - REGMAP_IRQ_REG(BXTWC_PWRBTN_IRQ, 1, 0x03), +}; + +static const struct regmap_irq bxtwc_regmap_irqs_pwrbtn[] = { +REGMAP_IRQ_REG (BXTWC_PWRBTN_IRQ ,0 ,0x01 ), }; static const struct regmap_irq bxtwc_regmap_irqs_bcu[] = {
@@ -125,7 +127,7 @@ static const struct regmap_irq bxtwc_regmap_irqs_adc[] = { };static const struct regmap_irq bxtwc_regmap_irqs_chgr[] = { -REGMAP_IRQ_REG (BXTWC_USBC_IRQ ,0 ,BIT (5 )), +REGMAP_IRQ_REG (BXTWC_USBC_IRQ ,0 ,0x20 ),REGMAP_IRQ_REG (BXTWC_CHGR0_IRQ ,0 ,0x1f ),REGMAP_IRQ_REG (BXTWC_CHGR1_IRQ ,1 ,0x1f ), };
@@ -144,7 +146,16 @@ static struct regmap_irq_chip bxtwc_regmap_irq_chip = { .mask_base = BXTWC_MIRQLVL1, .irqs = bxtwc_regmap_irqs, .num_irqs = ARRAY_SIZE(bxtwc_regmap_irqs), - .num_regs = 2, + .num_regs = 1, +}; + +static struct regmap_irq_chip bxtwc_regmap_irq_chip_pwrbtn = { + .name ="bxtwc_irq_chip_pwrbtn" , + .status_base =BXTWC_PWRBTNIRQ , + .mask_base =BXTWC_MPWRBTNIRQ , + .irqs = bxtwc_regmap_irqs_pwrbtn, + .num_irqs =ARRAY_SIZE (bxtwc_regmap_irqs_pwrbtn), + .num_regs =1 , };static struct regmap_irq_chip bxtwc_regmap_irq_chip_tmu = {
@@ -472,6 +483,16 @@ static int bxtwc_probe(struct platform_device *pdev)return ret; } + ret =bxtwc_add_chained_irq_chip (pmic, pmic->irq_chip_data, +BXTWC_PWRBTN_LVL1_IRQ , +IRQF_ONESHOT , + &bxtwc_regmap_irq_chip_pwrbtn, + &pmic->irq_chip_data_pwrbtn); +if (ret) { +dev_err (&pdev->dev,"Failed to add PWRBTN IRQ chip\n" ); +return ret; + } + ret = bxtwc_add_chained_irq_chip(pmic, pmic->irq_chip_data, BXTWC_TMU_LVL1_IRQ, IRQF_ONESHOT,
include/linux/mfd/intel_soc_pmic.h +1 -0
@@ -25,6 +25,7 @@ struct intel_soc_pmic {int irq;struct regmap *regmap;struct regmap_irq_chip_data *irq_chip_data; +struct regmap_irq_chip_data *irq_chip_data_pwrbtn;struct regmap_irq_chip_data *irq_chip_data_tmu;struct regmap_irq_chip_data *irq_chip_data_bcu;struct regmap_irq_chip_data *irq_chip_data_adc;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 112/237 mfd: max8997: Enale irq-wakeup unconditionally
In reply to Sasha LevinFrom: Marek Szyprowski <[email protected]>
[ Upstream commit efddff27c886e729a7f84a7205bd84d7d4af7336 ]
IRQ wake up support for MAX8997 driver was initially configured by respective property in pdata. However, after the driver conversion to device-tree, setting it was left as 'todo'. Nowadays most of other PMIC MFD drivers initialized from device-tree assume that they can be an irq wakeup source, so enable it also for MAX8997. This fixes support for wakeup from MAX8997 RTC alarm.
--- drivers/mfd/max8997.c | 8 +------- include/linux/mfd/max8997.h | 1 - 2 files changed, 1 insertion(+), 8 deletions(-)
drivers/mfd/max8997.c +1 -7
@@ -153,12 +153,6 @@ static struct max8997_platform_data *max8997_i2c_parse_dt_pdata( pd->ono =irq_of_parse_and_map (dev->of_node,1 ); -/* -* ToDo: the 'wakeup' member in the platform data is more of a linux -* specfic information. Hence, there is no binding for that yet and -* not parsed here. -*/ -return pd; }
@@ -246,7 +240,7 @@ static int max8997_i2c_probe(struct i2c_client *i2c,*/ /* MAX8997 has a power button input. */ -device_init_wakeup (max8997->dev, pdata->wakeup); +device_init_wakeup (max8997->dev, true);return ret;
include/linux/mfd/max8997.h +0 -1
@@ -178,7 +178,6 @@ struct max8997_led_platform_data {struct max8997_platform_data {/* IRQ */ int ono; -int wakeup;/* ---- PMIC ---- */ struct max8997_regulator_data *regulators;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 113/237 net: socionext: Stop PHY before resetting netsec
In reply to Sasha LevinFrom: Masahisa Kojima <[email protected]>
[ Upstream commit 8e850f25b5812aefedec6732732eb10e7b47cb5c ]
In ndo_stop, driver resets the netsec ethernet controller IP. When the netsec IP is reset, HW running mode turns to NRM mode and driver has to wait until this mode transition completes.
But mode transition to NRM will not complete if the PHY is in normal operation state. Netsec IP requires PHY is in power down state when it is reset.
This modification stops the PHY before resetting netsec.
Together with this modification, phy_addr is stored in netsec_priv structure because ndev->phydev is not yet ready in ndo_init.
--- drivers/net/ethernet/socionext/netsec.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)
drivers/net/ethernet/socionext/netsec.c +15 -4
@@ -274,6 +274,7 @@ struct netsec_priv {struct clk *clk;u32 msg_enable;u32 freq; +u32 phy_addr;bool rx_cksum_offload_flag; };
@@ -1346,11 +1347,11 @@ static int netsec_netdev_stop(struct net_device *ndev)netsec_uninit_pkt_dring (priv,NETSEC_RING_TX );netsec_uninit_pkt_dring (priv,NETSEC_RING_RX ); - ret =netsec_reset_hardware (priv, false); -phy_stop (ndev->phydev);phy_disconnect (ndev->phydev); + ret =netsec_reset_hardware (priv, false); +pm_runtime_put_sync (priv->dev);return ret;
@@ -1360,6 +1361,7 @@ static int netsec_netdev_init(struct net_device *ndev) {struct netsec_priv *priv =netdev_priv (ndev);int ret; +u16 data; ret =netsec_alloc_dring (priv,NETSEC_RING_TX );if (ret)
@@ -1369,6 +1371,11 @@ static int netsec_netdev_init(struct net_device *ndev)if (ret) goto err1; +/* set phy power down */ + data =netsec_phy_read (priv->mii_bus, priv->phy_addr,MII_BMCR ) | +BMCR_PDOWN ; +netsec_phy_write (priv->mii_bus, priv->phy_addr,MII_BMCR , data); + ret =netsec_reset_hardware (priv, true);if (ret) goto err2;
@@ -1418,7 +1425,7 @@ static const struct net_device_ops netsec_netdev_ops = { };static int netsec_of_probe (struct platform_device *pdev, -struct netsec_priv *priv) +struct netsec_priv *priv,u32 *phy_addr) { priv->phy_np =of_parse_phandle (pdev->dev.of_node,"phy-handle" ,0 );if (!priv->phy_np) {
@@ -1426,6 +1433,8 @@ static int netsec_of_probe(struct platform_device *pdev,return -EINVAL ; } + *phy_addr =of_mdio_parse_addr (&pdev->dev, priv->phy_np); + priv->clk =devm_clk_get (&pdev->dev,NULL );/* get by 'phy_ref_clk' */ if (IS_ERR (priv->clk)) {dev_err (&pdev->dev,"phy_ref_clk not found\n" );
@@ -1626,12 +1635,14 @@ static int netsec_probe(struct platform_device *pdev) }if (dev_of_node (&pdev->dev)) - ret =netsec_of_probe (pdev, priv); + ret =netsec_of_probe (pdev, priv, &phy_addr);else ret =netsec_acpi_probe (pdev, priv, &phy_addr);if (ret) goto free_ndev; + priv->phy_addr = phy_addr; +if (!priv->freq) {dev_err (&pdev->dev,"missing PHY reference clock frequency\n" ); ret = -ENODEV ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 114/237 fs/cifs: fix uninitialised variable warnings
In reply to Sasha LevinFrom: Garry McNulty <[email protected]>
[ Upstream commit ef2298a06d012973bbc592b86fe5ff730d4d0c63 ]
In some error conditions, resp_buftype can be passed uninitialised to free_rsp_buf(), potentially resulting in a spurious debug message. If resp_buftype randomly had the value 1 (CIFS_SMALL_BUFFER) then this would log a debug message.
The rsp pointer is initialised to NULL so there is no other side-effect.
Detected by CoverityScan, CID 1438585 ("Uninitialized scalar variable") Detected by CoverityScan, CID 1438667 ("Uninitialized scalar variable") Detected by CoverityScan, CID 1438764 ("Uninitialized scalar variable")
--- fs/cifs/smb2pdu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
fs/cifs/smb2pdu.c +3 -3
@@ -2283,7 +2283,7 @@ SMB2_open(const unsigned int xid, struct cifs_open_parms *oparms, __le16 *path,struct cifs_ses *ses = tcon->ses;struct kvec iov[SMB2_CREATE_IOV_SIZE ];struct kvec rsp_iov = {NULL ,0 }; -int resp_buftype; +int resp_buftype =CIFS_NO_BUFFER ;int rc =0 ;int flags =0 ;
@@ -2570,7 +2570,7 @@ SMB2_close_flags(const unsigned int xid, struct cifs_tcon *tcon,struct cifs_ses *ses = tcon->ses;struct kvec iov[1 ];struct kvec rsp_iov; -int resp_buftype; +int resp_buftype =CIFS_NO_BUFFER ;int rc =0 ;cifs_dbg (FYI ,"Close\n" );
@@ -2723,7 +2723,7 @@ query_info(const unsigned int xid, struct cifs_tcon *tcon,struct kvec iov[1 ];struct kvec rsp_iov;int rc =0 ; -int resp_buftype; +int resp_buftype =CIFS_NO_BUFFER ;struct cifs_ses *ses = tcon->ses;int flags =0 ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 115/237 spi: uniphier: fix incorrect property items
In reply to Sasha LevinFrom: Keiji Hayashibara <[email protected]>
[ Upstream commit 3511ba7d4ca6f39e2d060bb94e42a41ad1fee7bf ]
This commit fixes incorrect property because it was different from the actual.
The parameters of '#address-cells' and '#size-cells' were removed, and 'interrupts', 'pinctrl-names' and 'pinctrl-0' were added.
--- .../devicetree/bindings/spi/spi-uniphier.txt | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
Documentation/devicetree/bindings/spi/spi-uniphier.txt +8 -6
@@ -5,18 +5,20 @@ UniPhier SoCs have SCSSI which supports SPI single channel. Required properties: - compatible: should be "socionext,uniphier-scssi" - reg: address and length of the spi master registers - - #address-cells: must be <1>, see spi-bus.txt - - #size-cells: must be <0>, see spi-bus.txt - - clocks: A phandle to the clock for the device. - - resets: A phandle to the reset control for the device. + - interrupts: a single interrupt specifier + - pinctrl-names: should be "default" + - pinctrl-0: pin control state for the default mode + - clocks: a phandle to the clock for the device + - resets: a phandle to the reset control for the device Example: spi0: spi@54006000 { compatible = "socionext,uniphier-scssi"; reg = <0x54006000 0x100>; - #address-cells = <1>; - #size-cells = <0>; + interrupts = <0 39 4>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_spi0>; clocks = <&peri_clk 11>; resets = <&peri_rst 11>; };
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 116/237 selftests/ftrace: Fix to test kprobe $comm arg only if available
In reply to Sasha LevinFrom: Masami Hiramatsu <[email protected]>
[ Upstream commit 2452c96e617a0ff6fb2692e55217a3fa57a7322c ]
Test $comm in kprobe-event argument syntax testcase only if it is supported on the kernel because $comm has been introduced 4.8 kernel.
So on older stable kernel, it should be skipped.
--- .../selftests/ftrace/test.d/kprobe/kprobe_args_syntax.tc | 3 +++ 1 file changed, 3 insertions(+)
tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_syntax.tc +3 -0
@@ -78,8 +78,11 @@ test_badarg "\$stackp" "\$stack0+10" "\$stack1-10" echo "r ${PROBEFUNC} \$retval" > kprobe_events ! echo "p ${PROBEFUNC} \$retval" > kprobe_events +# $comm was introduced in 4.8, older kernels reject it. +if grep -A1 "fetcharg:" README | grep -q '\$comm' ; then : "Comm access" test_goodarg "\$comm" +fi : "Indirect memory access" test_goodarg "+0(${GOODREG})" "-0(${GOODREG})" "+10(\$stack)" \
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 117/237 selftests: watchdog: fix message when /dev/watchdog open fails
In reply to Sasha LevinFrom: "Shuah Khan (Samsung OSG)" <[email protected]>
[ Upstream commit 9a244229a4b850b11952a0df79607c69b18fd8df ]
When /dev/watchdog open fails, watchdog exits with "watchdog not enabled" message. This is incorrect when open fails due to insufficient privilege.
Fix message to clearly state the reason when open fails with EACCESS when a non-root user runs it.
--- tools/testing/selftests/watchdog/watchdog-test.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
tools/testing/selftests/watchdog/watchdog-test.c +7 -1
@@ -89,7 +89,13 @@ int main(int argc, char *argv[]) fd =open ("/dev/watchdog" ,O_WRONLY );if (fd ==-1 ) { -printf ("Watchdog device not enabled.\n" ); +if (errno ==ENOENT ) +printf ("Watchdog device not enabled.\n" ); +else if (errno ==EACCES ) +printf ("Run watchdog as root.\n" ); +else +printf ("Watchdog device open failed %s\n" , +strerror (errno));exit (-1 ); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 118/237 selftests: watchdog: Fix error message.
In reply to Sasha LevinFrom: Jerry Hoemann <[email protected]>
[ Upstream commit 04d5e4bd37516ad60854eb74592c7dbddd75d277 ]
Printf's say errno but print the string version of error. Make consistent.
--- tools/testing/selftests/watchdog/watchdog-test.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
tools/testing/selftests/watchdog/watchdog-test.c +4 -4
@@ -109,7 +109,7 @@ int main(int argc, char *argv[])printf ("Last boot is caused by: %s.\n" , (flags !=0 ) ?"Watchdog" :"Power-On-Reset" ); else - printf("WDIOC_GETBOOTSTATUS errno '%s'\n", strerror(errno)); + printf("WDIOC_GETBOOTSTATUS error '%s'\n", strerror(errno));break ;case 'd' : flags =WDIOS_DISABLECARD ;
@@ -117,7 +117,7 @@ int main(int argc, char *argv[])if (!ret)printf ("Watchdog card disabled.\n" );else -printf ("WDIOS_DISABLECARD errno '%s'\n" ,strerror (errno)); +printf ("WDIOS_DISABLECARD error '%s'\n" ,strerror (errno));break ;case 'e' : flags =WDIOS_ENABLECARD ;
@@ -125,7 +125,7 @@ int main(int argc, char *argv[])if (!ret)printf ("Watchdog card enabled.\n" );else -printf ("WDIOS_ENABLECARD errno '%s'\n" ,strerror (errno)); +printf ("WDIOS_ENABLECARD error '%s'\n" ,strerror (errno));break ;case 'p' : ping_rate =strtoul (optarg,NULL ,0 );
@@ -139,7 +139,7 @@ int main(int argc, char *argv[])if (!ret)printf ("Watchdog timeout set to %u seconds.\n" , flags);else -printf ("WDIOC_SETTIMEOUT errno '%s'\n" ,strerror (errno)); +printf ("WDIOC_SETTIMEOUT error '%s'\n" ,strerror (errno));break ;default :usage (argv[0 ]);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 119/237 selftests: kvm: Fix -Wformat warnings
In reply to Sasha LevinFrom: Andrea Parri <[email protected]>
[ Upstream commit fb363e2d20351e1d16629df19e7bce1a31b3227a ]
Fixes the following warnings:
dirty_log_test.c: In function ‘help’:
dirty_log_test.c:216:9: warning: format ‘%lu’ expects argument of type ‘long unsigned int’, but argument 2 has type ‘int’ [-Wformat=]
printf(" -i: specify iteration counts (default: %"PRIu64")\n",
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from include/test_util.h:18:0,
from dirty_log_test.c:16:
/usr/include/inttypes.h:105:34: note: format string is defined here
# define PRIu64 __PRI64_PREFIX "u"
dirty_log_test.c:218:9: warning: format ‘%lu’ expects argument of type ‘long unsigned int’, but argument 2 has type ‘int’ [-Wformat=]
printf(" -I: specify interval in ms (default: %"PRIu64" ms)\n",
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from include/test_util.h:18:0,
from dirty_log_test.c:16:
/usr/include/inttypes.h:105:34: note: format string is defined here
# define PRIu64 __PRI64_PREFIX "u"--- tools/testing/selftests/kvm/dirty_log_test.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/testing/selftests/kvm/dirty_log_test.c +2 -2
@@ -31,9 +31,9 @@/* How many pages to dirty for each guest loop */ #define TEST_PAGES_PER_LOOP 1024/* How many host loops to run (one KVM_GET_DIRTY_LOG for each loop) */ -#define TEST_HOST_LOOP_N 32 +#define TEST_HOST_LOOP_N 32UL/* Interval for each host loop (ms) */ -#define TEST_HOST_LOOP_INTERVAL 10 +#define TEST_HOST_LOOP_INTERVAL 10UL/* * Guest variables. We use these variables to share data between host
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 120/237 selftests: fix warning: "_GNU_SOURCE" redefined
In reply to Sasha LevinFrom: Peng Hao <[email protected]>
[ Upstream commit 0387662d1b6c5ad2950d8e94d5e380af3f15c05c ]
Makefile contains -D_GNU_SOURCE. remove define "_GNU_SOURCE" in c files.
--- tools/testing/selftests/proc/fd-001-lookup.c | 2 +- tools/testing/selftests/proc/fd-003-kthread.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
tools/testing/selftests/proc/fd-001-lookup.c +1 -1
@@ -14,7 +14,7 @@* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ // Test /proc/*/fd lookup. -#define _GNU_SOURCE +#undef NDEBUG#include <assert.h> #include <dirent.h>
tools/testing/selftests/proc/fd-003-kthread.c +1 -1
@@ -14,7 +14,7 @@* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ // Test that /proc/$KERNEL_THREAD/fd/ is empty. -#define _GNU_SOURCE +#undef NDEBUG#include <sys/syscall.h> #include <assert.h>
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 121/237 thermal: rcar_thermal: fix duplicate IRQ request
In reply to Sasha LevinFrom: Sergei Shtylyov <[email protected]>
[ Upstream commit df016bbba63743bbef9ff5c6c282561211dd72cc ]
The driver on R8A77995 requests the same IRQ twice since platform_get_resource() is always called for the 1st IRQ resource.
--- drivers/thermal/rcar_thermal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/thermal/rcar_thermal.c +1 -1
@@ -493,7 +493,7 @@ static int rcar_thermal_probe(struct platform_device *pdev)pm_runtime_get_sync (dev);for (i =0 ; i < chip->nirqs; i++) { - irq =platform_get_resource (pdev,IORESOURCE_IRQ ,0 ); + irq =platform_get_resource (pdev,IORESOURCE_IRQ , i);if (!irq)continue ;if (!common->base) {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 122/237 thermal: rcar_thermal: Prevent hardware access during system suspend
In reply to Sasha LevinFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 3a31386217628ffe2491695be2db933c25dde785 ]
On r8a7791/koelsch, sometimes the following message is printed during system suspend:
rcar_thermal e61f0000.thermal: thermal sensor was broken
This happens if the workqueue runs while the device is already suspended. Fix this by using the freezable system workqueue instead, cfr. commit 51e20d0e3a60cf46 ("thermal: Prevent polling from happening during system suspend").
--- drivers/thermal/rcar_thermal.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/thermal/rcar_thermal.c +2 -2
@@ -434,8 +434,8 @@ static irqreturn_t rcar_thermal_irq(int irq, void *data)rcar_thermal_for_each_priv (priv, common) {if (rcar_thermal_had_changed (priv, status)) {rcar_thermal_irq_disable (priv); -schedule_delayed_work (&priv->work, -msecs_to_jiffies (300 )); +queue_delayed_work (system_freezable_wq, &priv->work, +msecs_to_jiffies (300 )); } }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 123/237 net: ethernet: cadence: fix socket buffer corruption problem
In reply to Sasha LevinFrom: Tristram Ha <[email protected]>
[ Upstream commit 899ecaedd15599c22553d158f53b127cc1632dc2 ]
Socket buffer is not re-created when headroom is 2 and tailroom is 1.
--- drivers/net/ethernet/cadence/macb_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/cadence/macb_main.c +1 -1
@@ -1721,7 +1721,7 @@ static int macb_pad_and_fcs(struct sk_buff **skb, struct net_device *ndev) padlen =0 ;/* No room for FCS, need to reallocate skb. */ else - padlen =ETH_FCS_LEN - tailroom; + padlen =ETH_FCS_LEN ; }else {/* Add room for FCS. */ padlen +=ETH_FCS_LEN ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 124/237 bpf: devmap: fix wrong interface selection in notifier_call
In reply to Sasha LevinFrom: Taehee Yoo <[email protected]>
[ Upstream commit f592f804831f1cf9d1f9966f58c80f150e6829b5 ]
The dev_map_notification() removes interface in devmap if unregistering interface's ifindex is same.
But only checking ifindex is not enough because other netns can have same ifindex. so that wrong interface selection could occurred. Hence netdev pointer comparison code is added.
v2: compare netdev pointer instead of using net_eq() (Daniel Borkmann)
v1: Initial patch
--- kernel/bpf/devmap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
kernel/bpf/devmap.c +1 -2
@@ -520,8 +520,7 @@ static int dev_map_notification(struct notifier_block *notifier,struct bpf_dtab_netdev *dev, *odev; dev =READ_ONCE (dtab->netdev_map[i]); -if (!dev || - dev->dev->ifindex != netdev->ifindex) +if (!dev || netdev != dev->dev)continue ; odev =cmpxchg (&dtab->netdev_map[i], dev,NULL );if (dev == odev)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 125/237 bpf, btf: fix a missing check bug in btf_parse
In reply to Sasha LevinFrom: Martin Lau <[email protected]>
[ Upstream commit 4a6998aff82a20a1aece86a186d8e5263f8b2315 ]
Wenwen Wang reported:
In btf_parse(), the header of the user-space btf data 'btf_data' is firstly parsed and verified through btf_parse_hdr(). In btf_parse_hdr(), the header is copied from user-space 'btf_data' to kernel-space 'btf->hdr' and then verified. If no error happens during the verification process, the whole data of 'btf_data', including the header, is then copied to 'data' in btf_parse(). It is obvious that the header is copied twice here. More importantly, no check is enforced after the second copy to make sure the headers obtained in these two copies are same. Given that 'btf_data' resides in the user space, a malicious user can race to modify the header between these two copies. By doing so, the user can inject inconsistent data, which can cause undefined behavior of the kernel and introduce potential security risk.
This issue is similar to the one fixed in commit 8af03d1ae2e1 ("bpf:
btf: Fix a missing check bug"). To fix it, this patch copies the user 'btf_data' *before* parsing / verifying the BTF header.
--- kernel/bpf/btf.c | 55 ++++++++++++++++++++++-------------------------- 1 file changed, 25 insertions(+), 30 deletions(-)
kernel/bpf/btf.c +25 -30
@@ -2067,50 +2067,44 @@ static int btf_check_sec_info(struct btf_verifier_env *env,return 0 ; } -static int btf_parse_hdr (struct btf_verifier_env *env,void __user *btf_data, -u32 btf_data_size) +static int btf_parse_hdr (struct btf_verifier_env *env) { +u32 hdr_len, hdr_copy, btf_data_size;const struct btf_header *hdr; -u32 hdr_len, hdr_copy; -/* -* Minimal part of the "struct btf_header" that -* contains the hdr_len. -*/ -struct btf_min_header { -u16 magic; -u8 version; -u8 flags; -u32 hdr_len; - }__user *min_hdr;struct btf *btf;int err; btf = env->btf; - min_hdr = btf_data; + btf_data_size = btf->data_size; -if (btf_data_size <sizeof (*min_hdr)) { +if (btf_data_size < + offsetof(struct btf_header , hdr_len) +sizeof (hdr->hdr_len)) {btf_verifier_log (env,"hdr_len not found" );return -EINVAL ; } -if (get_user (hdr_len, &min_hdr->hdr_len)) -return -EFAULT ; - + hdr = btf->data; + hdr_len = hdr->hdr_len;if (btf_data_size < hdr_len) {btf_verifier_log (env,"btf_header not found" );return -EINVAL ; } - err =bpf_check_uarg_tail_zero (btf_data,sizeof (btf->hdr), hdr_len); -if (err) { -if (err == -E2BIG ) -btf_verifier_log (env,"Unsupported btf_header" ); -return err; +/* Ensure the unsupported header fields are zero */ +if (hdr_len >sizeof (btf->hdr)) { +u8 *expected_zero = btf->data +sizeof (btf->hdr); +u8 *end = btf->data + hdr_len; + +for (; expected_zero < end; expected_zero++) { +if (*expected_zero) { +btf_verifier_log (env,"Unsupported btf_header" ); +return -E2BIG ; + } + } } hdr_copy =min_t (u32, hdr_len,sizeof (btf->hdr)); -if (copy_from_user (&btf->hdr, btf_data, hdr_copy)) -return -EFAULT ; +memcpy (&btf->hdr, btf->data, hdr_copy); hdr = &btf->hdr;
@@ -2183,10 +2177,6 @@ static struct btf *btf_parse(void __user *btf_data, u32 btf_data_size, } env->btf = btf; - err =btf_parse_hdr (env, btf_data, btf_data_size); -if (err) - goto errout; - data =kvmalloc (btf_data_size,GFP_KERNEL | __GFP_NOWARN);if (!data) { err = -ENOMEM ;
@@ -2195,13 +2185,18 @@ static struct btf *btf_parse(void __user *btf_data, u32 btf_data_size, btf->data = data; btf->data_size = btf_data_size; - btf->nohdr_data = btf->data + btf->hdr.hdr_len;if (copy_from_user (data, btf_data, btf_data_size)) { err = -EFAULT ; goto errout; } + err =btf_parse_hdr (env); +if (err) + goto errout; + + btf->nohdr_data = btf->data + btf->hdr.hdr_len; + err =btf_parse_str_sec (env);if (err) goto errout;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 126/237 powerpc/process: Fix flush_all_to_thread for SPE
In reply to Sasha LevinFrom: Felipe Rechia <[email protected]>
[ Upstream commit e901378578c62202594cba0f6c076f3df365ec91 ]
Fix a bug introduced by the creation of flush_all_to_thread() for processors that have SPE (Signal Processing Engine) and use it to compute floating-point operations.
Quoted 1 line
From userspace perspective, the problem was seen in attempts of
computing floating-point operations which should generate exceptions. For example:
fork(); float x = 0.0 / 0.0; isnan(x); // forked process returns False (should be True)
The operation above also should always cause the SPEFSCR FINV bit to be set. However, the SPE floating-point exceptions were turned off after a fork().
Kernel versions prior to the bug used flush_spe_to_thread(), which first saves SPEFSCR register values in tsk->thread and then calls giveup_spe(tsk).
After commit 579e633e764e, the save_all() function was called first to giveup_spe(), and then the SPEFSCR register values were saved in tsk->thread. This would save the SPEFSCR register values after disabling SPE for that thread, causing the bug described above.
Fixes 579e633e764e ("powerpc: create flush_all_to_thread()")
--- arch/powerpc/kernel/process.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
arch/powerpc/kernel/process.c +1 -2
@@ -575,12 +575,11 @@ void flush_all_to_thread(struct task_struct *tsk)if (tsk->thread.regs) {preempt_disable ();BUG_ON (tsk != current); -save_all (tsk); -#ifdef CONFIG_SPE if (tsk->thread.regs->msr &MSR_SPE ) tsk->thread.spefscr =mfspr (SPRN_SPEFSCR );#endif +save_all (tsk);preempt_enable (); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 127/237 sparc64: Rework xchg() definition to avoid warnings.
In reply to Sasha LevinFrom: "David S. Miller" <[email protected]>
[ Upstream commit 6c2fc9cddc1ffdef8ada1dc8404e5affae849953 ]
Such as:
fs/ocfs2/file.c: In function ‘ocfs2_file_write_iter’:./arch/sparc/include/asm/cmpxchg_64.h:55:22: warning: value computed is not used [-Wunused-value]
#define xchg(ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
and
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c: In function ‘ixgbevf_xdp_setup’:./arch/sparc/include/asm/cmpxchg_64.h:55:22: warning: value computed is not used [-Wunused-value]
#define xchg(ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
--- arch/sparc/include/asm/cmpxchg_64.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
arch/sparc/include/asm/cmpxchg_64.h +6 -1
@@ -52,7 +52,12 @@ static inline unsigned long xchg64(__volatile__ unsigned long *m, unsigned longreturn val; } -#define xchg (ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr)))) +#define xchg (ptr,x) \ +({ __typeof__(*(ptr)) __ret; \ + __ret = (__typeof__(*(ptr))) \ + __xchg((unsigned long)(x), (ptr), sizeof(*(ptr))); \ + __ret; \ +})void __xchg_called_with_bad_pointer (void );
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 128/237 arm64: lib: use C string functions with KASAN enabled
In reply to Sasha LevinFrom: Andrey Ryabinin <[email protected]>
[ Upstream commit 19a2ca0fb560fd7be7b5293c6b652c6d6078dcde ]
ARM64 has asm implementation of memchr(), memcmp(), str[r]chr(), str[n]cmp(), str[n]len(). KASAN don't see memory accesses in asm code, thus it can potentially miss many bugs.
Ifdef out __HAVE_ARCH_* defines of these functions when KASAN is enabled, so the generic implementations from lib/string.c will be used.
We can't just remove the asm functions because efistub uses them. And we can't have two non-weak functions either, so declare the asm functions as weak.
--- arch/arm64/include/asm/string.h | 14 ++++++++------ arch/arm64/kernel/arm64ksyms.c | 7 +++++-- arch/arm64/lib/memchr.S | 2 +- arch/arm64/lib/memcmp.S | 2 +- arch/arm64/lib/strchr.S | 2 +- arch/arm64/lib/strcmp.S | 2 +- arch/arm64/lib/strlen.S | 2 +- arch/arm64/lib/strncmp.S | 2 +- arch/arm64/lib/strnlen.S | 2 +- arch/arm64/lib/strrchr.S | 2 +- 10 files changed, 21 insertions(+), 16 deletions(-)
arch/arm64/include/asm/string.h +8 -6
@@ -16,6 +16,7 @@#ifndef __ASM_STRING_H#define __ASM_STRING_H +#ifndef CONFIG_KASAN #define __HAVE_ARCH_STRRCHRextern char *strrchr (const char *,int c);
@@ -34,6 +35,13 @@ extern __kernel_size_t strlen(const char *);#define __HAVE_ARCH_STRNLENextern __kernel_size_t strnlen (const char *,__kernel_size_t ); +#define __HAVE_ARCH_MEMCMP +extern int memcmp (const void *,const void *,size_t ); + +#define __HAVE_ARCH_MEMCHR +extern void *memchr (const void *,int ,__kernel_size_t ); +#endif +#define __HAVE_ARCH_MEMCPYextern void *memcpy (void *,const void *,__kernel_size_t );extern void *__memcpy (void *,const void *,__kernel_size_t );
@@ -42,16 +50,10 @@ extern void *__memcpy(void *, const void *, __kernel_size_t);extern void *memmove (void *,const void *,__kernel_size_t );extern void *__memmove (void *,const void *,__kernel_size_t ); -#define __HAVE_ARCH_MEMCHR -extern void *memchr (const void *,int ,__kernel_size_t ); -#define __HAVE_ARCH_MEMSETextern void *memset (void *,int ,__kernel_size_t );extern void *__memset (void *,int ,__kernel_size_t ); -#define __HAVE_ARCH_MEMCMP -extern int memcmp (const void *,const void *,size_t ); -#ifdef CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE #define __HAVE_ARCH_MEMCPY_FLUSHCACHEvoid memcpy_flushcache (void *dst,const void *src,size_t cnt);
arch/arm64/kernel/arm64ksyms.c +5 -2
@@ -44,20 +44,23 @@ EXPORT_SYMBOL(__arch_copy_in_user);EXPORT_SYMBOL (memstart_addr);/* string / mem functions */ +#ifndef CONFIG_KASAN EXPORT_SYMBOL (strchr);EXPORT_SYMBOL (strrchr);EXPORT_SYMBOL (strcmp);EXPORT_SYMBOL (strncmp);EXPORT_SYMBOL (strlen);EXPORT_SYMBOL (strnlen); +EXPORT_SYMBOL (memcmp); +EXPORT_SYMBOL (memchr); +#endif +EXPORT_SYMBOL (memset);EXPORT_SYMBOL (memcpy);EXPORT_SYMBOL (memmove);EXPORT_SYMBOL (__memset);EXPORT_SYMBOL (__memcpy);EXPORT_SYMBOL (__memmove); -EXPORT_SYMBOL (memchr); -EXPORT_SYMBOL (memcmp);/* atomic bitops */ EXPORT_SYMBOL (set_bit);
arch/arm64/lib/memchr.S +1 -1
@@ -30,7 +30,7 @@ * Returns: * x0 - address of first occurrence of 'c' or 0 */ -ENTRY(memchr) +WEAK(memchr) and w1, w1, #0xff 1: subs x2, x2, #1 b.mi 2f
arch/arm64/lib/memcmp.S +1 -1
@@ -58,7 +58,7 @@ pos .req x11 limit_wd .req x12 mask .req x13 -ENTRY(memcmp) +WEAK(memcmp) cbz limit, .Lret0 eor tmp1, src1, src2 tst tmp1, #7
arch/arm64/lib/strchr.S +1 -1
@@ -29,7 +29,7 @@ * Returns: * x0 - address of first occurrence of 'c' or 0 */ -ENTRY(strchr) +WEAK(strchr) and w1, w1, #0xff 1: ldrb w2, [x0], #1 cmp w2, w1
arch/arm64/lib/strcmp.S +1 -1
@@ -60,7 +60,7 @@ tmp3 .req x9 zeroones .req x10 pos .req x11 -ENTRY(strcmp) +WEAK(strcmp) eor tmp1, src1, src2 mov zeroones, #REP8_01 tst tmp1, #7
arch/arm64/lib/strlen.S +1 -1
@@ -56,7 +56,7 @@ pos .req x12 #define REP8_7f 0x7f7f7f7f7f7f7f7f #define REP8_80 0x8080808080808080 -ENTRY(strlen) +WEAK(strlen) mov zeroones, #REP8_01 bic src, srcin, #15 ands tmp1, srcin, #15
arch/arm64/lib/strncmp.S +1 -1
@@ -64,7 +64,7 @@ limit_wd .req x13 mask .req x14 endloop .req x15 -ENTRY(strncmp) +WEAK(strncmp) cbz limit, .Lret0 eor tmp1, src1, src2 mov zeroones, #REP8_01
arch/arm64/lib/strnlen.S +1 -1
@@ -59,7 +59,7 @@ limit_wd .req x14 #define REP8_7f 0x7f7f7f7f7f7f7f7f #define REP8_80 0x8080808080808080 -ENTRY(strnlen) +WEAK(strnlen) cbz limit, .Lhit_limit mov zeroones, #REP8_01 bic src, srcin, #15
arch/arm64/lib/strrchr.S +1 -1
@@ -29,7 +29,7 @@ * Returns: * x0 - address of last occurrence of 'c' or 0 */ -ENTRY(strrchr) +WEAK(strrchr) mov x3, #0 and w1, w1, #0xff 1: ldrb w2, [x0], #1
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 129/237 fs/ocfs2/dlm/dlmdebug.c: fix a sleep-in-atomic-context bug in dlm_print_one_mle()
In reply to Sasha LevinFrom: Jia-Ju Bai <[email protected]>
[ Upstream commit 999865764f5f128896402572b439269acb471022 ]
The kernel module may sleep with holding a spinlock.
The function call paths (from bottom to top) in Linux-4.16 are:
[FUNC] get_zeroed_page(GFP_NOFS) fs/ocfs2/dlm/dlmdebug.c, 332: get_zeroed_page in dlm_print_one_mle fs/ocfs2/dlm/dlmmaster.c, 240: dlm_print_one_mle in __dlm_put_mle fs/ocfs2/dlm/dlmmaster.c, 255: __dlm_put_mle in dlm_put_mle fs/ocfs2/dlm/dlmmaster.c, 254: spin_lock in dlm_put_ml
[FUNC] get_zeroed_page(GFP_NOFS) fs/ocfs2/dlm/dlmdebug.c, 332: get_zeroed_page in dlm_print_one_mle fs/ocfs2/dlm/dlmmaster.c, 240: dlm_print_one_mle in __dlm_put_mle fs/ocfs2/dlm/dlmmaster.c, 222: __dlm_put_mle in dlm_put_mle_inuse fs/ocfs2/dlm/dlmmaster.c, 219: spin_lock in dlm_put_mle_inuse
To fix this bug, GFP_NOFS is replaced with GFP_ATOMIC.
This bug is found by my static analysis tool DSAC.
--- fs/ocfs2/dlm/dlmdebug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ocfs2/dlm/dlmdebug.c +1 -1
@@ -329,7 +329,7 @@ void dlm_print_one_mle(struct dlm_master_list_entry *mle) {char *buf; - buf = (char *)get_zeroed_page (GFP_NOFS ); + buf = (char *)get_zeroed_page (GFP_ATOMIC );if (buf) {dump_mle (mle, buf,PAGE_SIZE -1 );free_page ((unsigned long )buf);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 130/237 mm/page-writeback.c: fix range_cyclic writeback vs writepages deadlock
In reply to Sasha LevinFrom: Dave Chinner <[email protected]>
[ Upstream commit 64081362e8ff4587b4554087f3cfc73d3e0a4cd7 ]
We've recently seen a workload on XFS filesystems with a repeatable deadlock between background writeback and a multi-process application doing concurrent writes and fsyncs to a small range of a file.
range_cyclic
writeback Process 1 Process 2
xfs_vm_writepages
write_cache_pages
writeback_index = 2
cycled = 0
....
find page 2 dirty
lock Page 2
->writepage
page 2 writeback
page 2 clean
page 2 added to bio
no more pages
write()
locks page 1
dirties page 1
locks page 2
dirties page 1
fsync()
....
xfs_vm_writepages write_cache_pages
start index 0
find page 1 towrite
lock Page 1
->writepage
page 1 writeback
page 1 clean
page 1 added to bio
find page 2 towrite
lock Page 2
page 2 is writeback
<blocks>
write() locks page 1 dirties page 1 fsync()
....
xfs_vm_writepages write_cache_pages
start index 0
!done && !cycled
sets index to 0, restarts lookup
find page 1 dirty
find page 1 towrite lock Page 1 page 1 is writeback <blocks>
lock Page 1
<blocks>
DEADLOCK because:
- process 1 needs page 2 writeback to complete to make enough progress to issue IO pending for page 1
- writeback needs page 1 writeback to complete so process 2 can progress and unlock the page it is blocked on, then it can issue the IO pending for page 2
- process 2 can't make progress until process 1 issues IO for page 1
The underlying cause of the problem here is that range_cyclic writeback is processing pages in descending index order as we hold higher index pages in a structure controlled from above write_cache_pages(). The write_cache_pages() caller needs to be able to submit these pages for IO before write_cache_pages restarts writeback at mapping index 0 to avoid wcp inverting the page lock/writeback wait order.
generic_writepages() is not susceptible to this bug as it has no private context held across write_cache_pages() - filesystems using this infrastructure always submit pages in ->writepage immediately and so there is no problem with range_cyclic going back to mapping index 0.
However:
mpage_writepages() has a private bio context, exofs_writepages() has page_collect fuse_writepages() has fuse_fill_wb_data nfs_writepages() has nfs_pageio_descriptor xfs_vm_writepages() has xfs_writepage_ctx
All of these ->writepages implementations can hold pages under writeback in their private structures until write_cache_pages() returns, and hence they are all susceptible to this deadlock.
Also worth noting is that ext4 has it's own bastardised version of write_cache_pages() and so it /may/ have an equivalent deadlock. I looked at the code long enough to understand that it has a similar retry loop for range_cyclic writeback reaching the end of the file and then promptly ran away before my eyes bled too much. I'll leave it for the ext4 developers to determine if their code is actually has this deadlock and how to fix it if it has.
There's a few ways I can see avoid this deadlock. There's probably more, but these are the first I've though of:
1. get rid of range_cyclic altogether
2. range_cyclic always stops at EOF, and we start again from writeback index 0 on the next call into write_cache_pages()
2a. wcp also returns EAGAIN to ->writepages implementations to indicate range cyclic has hit EOF. writepages implementations can then flush the current context and call wpc again to continue. i.e. lift the retry into the ->writepages implementation
3. range_cyclic uses trylock_page() rather than lock_page(), and it skips pages it can't lock without blocking. It will already do this for pages under writeback, so this seems like a no-brainer
3a. all non-WB_SYNC_ALL writeback uses trylock_page() to avoid blocking as per pages under writeback.
I don't think #1 is an option - range_cyclic prevents frequently dirtied lower file offset from starving background writeback of rarely touched higher file offsets.
#2 is simple, and I don't think it will have any impact on performance as going back to the start of the file implies an immediate seek. We'll have exactly the same number of seeks if we switch writeback to another inode, and then come back to this one later and restart from index 0.
#2a is pretty much "status quo without the deadlock". Moving the retry loop up into the wcp caller means we can issue IO on the pending pages before calling wcp again, and so avoid locking or waiting on pages in the wrong order. I'm not convinced we need to do this given that we get the same thing from #2 on the next writeback call from the writeback infrastructure.
#3 is really just a band-aid - it doesn't fix the access/wait inversion problem, just prevents it from becoming a deadlock situation. I'd prefer we fix the inversion, not sweep it under the carpet like this.
#3a is really an optimisation that just so happens to include the band-aid fix of #3.
So it seems that the simplest way to fix this issue is to implement solution #2
--- mm/page-writeback.c | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-)
mm/page-writeback.c +15 -18
@@ -2149,6 +2149,13 @@ EXPORT_SYMBOL(tag_pages_for_writeback);* not miss some pages (e.g., because some other process has cleared TOWRITE * tag we set). The rule we follow is that TOWRITE tag can be cleared only * by the process clearing the DIRTY tag (and submitting the page for IO). +* +* To avoid deadlocks between range_cyclic writeback and callers that hold +* pages in PageWriteback to aggregate IO until write_cache_pages() returns, +* we do not loop back to the start of the file. Doing so causes a page +* lock/page writeback access order inversion - we should only ever lock +* multiple pages in ascending page->index order, and looping back to the start +* of the file violates that rule and causes deadlocks. */ int write_cache_pages(struct address_space *mapping, struct writeback_control *wbc, writepage_t writepage,
@@ -2163,7 +2170,6 @@ int write_cache_pages(struct address_space *mapping,pgoff_t index;pgoff_t end;/* Inclusive */ pgoff_t done_index; -int cycled;int range_whole =0 ;int tag;
@@ -2171,23 +2177,17 @@ int write_cache_pages(struct address_space *mapping,if (wbc->range_cyclic) { writeback_index = mapping->writeback_index;/* prev offset */ index = writeback_index; -if (index ==0 ) - cycled =1 ; -else - cycled =0 ; end =-1 ; }else { index = wbc->range_start >>PAGE_SHIFT ; end = wbc->range_end >>PAGE_SHIFT ;if (wbc->range_start ==0 && wbc->range_end ==LLONG_MAX ) range_whole =1 ; - cycled =1 ;/* ignore range_cyclic tests */ }if (wbc->sync_mode ==WB_SYNC_ALL || wbc->tagged_writepages) tag =PAGECACHE_TAG_TOWRITE ;else tag =PAGECACHE_TAG_DIRTY ; -retry:if (wbc->sync_mode ==WB_SYNC_ALL || wbc->tagged_writepages)tag_pages_for_writeback (mapping, index, end); done_index = index;
@@ -2279,17 +2279,14 @@ int write_cache_pages(struct address_space *mapping,pagevec_release (&pvec);cond_resched (); } -if (!cycled && !done) { -/* -* range_cyclic: -* We hit the last page and there is more work to be done: wrap -* back to the start of the file -*/ - cycled =1 ; - index =0 ; - end = writeback_index -1 ; - goto retry; - } + +/* +* If we hit the last page and there is more work to be done: wrap +* back the index back to the start of the file for the next +* time we are called. +*/ +if (wbc->range_cyclic && !done) + done_index =0 ;if (wbc->range_cyclic || (range_whole && wbc->nr_to_write >0 )) mapping->writeback_index = done_index;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 131/237 tools/testing/selftests/vm/gup_benchmark.c: fix 'write' flag usage
In reply to Sasha LevinFrom: Keith Busch <[email protected]>
[ Upstream commit 319e0bec1aecb36c5ac6d23812af487ff2c8f47f ]
If the '-w' parameter was provided, the benchmark would exit due to a mssing 'break'.
--- tools/testing/selftests/vm/gup_benchmark.c | 1 + 1 file changed, 1 insertion(+)
tools/testing/selftests/vm/gup_benchmark.c +1 -0
@@ -51,6 +51,7 @@ int main(int argc, char **argv)break ;case 'w' : write =1 ; +break ;default :return -1 ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 132/237 mm: thp: fix MADV_DONTNEED vs migrate_misplaced_transhuge_page race condition
In reply to Sasha LevinFrom: Andrea Arcangeli <[email protected]>
[ Upstream commit d7c3393413fe7e7dc54498ea200ea94742d61e18 ]
Patch series "migrate_misplaced_transhuge_page race conditions".
Aaron found a new instance of the THP MADV_DONTNEED race against pmdp_clear_flush* variants, that was apparently left unfixed.
While looking into the race found by Aaron, I may have found two more issues in migrate_misplaced_transhuge_page.
These race conditions would not cause kernel instability, but they'd corrupt userland data or leave data non zero after MADV_DONTNEED.
I did only minor testing, and I don't expect to be able to reproduce this (especially the lack of ->invalidate_range before migrate_page_copy, requires the latest iommu hardware or infiniband to reproduce). The last patch is noop for x86 and it needs further review from maintainers of archs that implement flush_cache_range() (not in CC yet).
To avoid confusion, it's not the first patch that introduces the bug fixed in the second patch, even before removing the pmdp_huge_clear_flush_notify, that _notify suffix was called after migrate_page_copy already run.
This patch (of 3):
This is a corollary of ced108037c2aa ("thp: fix MADV_DONTNEED vs. numa balancing race"), 58ceeb6bec8 ("thp: fix MADV_DONTNEED vs. MADV_FREE race") and 5b7abeae3af8c ("thp: fix MADV_DONTNEED vs clear soft dirty race).
When the above three fixes where posted Dave asked
https://lkml.kernel.org/r/[email protected]
but apparently this was missed.
The pmdp_clear_flush* in migrate_misplaced_transhuge_page() was introduced in a54a407fbf7 ("mm: Close races between THP migration and PMD numa clearing").
The important part of such commit is only the part where the page lock is not released until the first do_huge_pmd_numa_page() finished disarming the pagenuma/protnone.
The addition of pmdp_clear_flush() wasn't beneficial to such commit and there's no commentary about such an addition either.
I guess the pmdp_clear_flush() in such commit was added just in case for safety, but it ended up introducing the MADV_DONTNEED race condition found by Aaron.
At that point in time nobody thought of such kind of MADV_DONTNEED race conditions yet (they were fixed later) so the code may have looked more robust by adding the pmdp_clear_flush().
This specific race condition won't destabilize the kernel, but it can confuse userland because after MADV_DONTNEED the memory won't be zeroed out.
This also optimizes the code and removes a superfluous TLB flush.
--- mm/migrate.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-)
mm/migrate.c +18 -7
@@ -2048,15 +2048,26 @@ int migrate_misplaced_transhuge_page(struct mm_struct *mm, entry =maybe_pmd_mkwrite (pmd_mkdirty (entry), vma);/* -* Clear the old entry under pagetable lock and establish the new PTE. -* Any parallel GUP will either observe the old page blocking on the -* page lock, block on the page table lock or observe the new page. -* The SetPageUptodate on the new page and page_add_new_anon_rmap -* guarantee the copy is visible before the pagetable update. +* Overwrite the old entry under pagetable lock and establish +* the new PTE. Any parallel GUP will either observe the old +* page blocking on the page lock, block on the page table +* lock or observe the new page. The SetPageUptodate on the +* new page and page_add_new_anon_rmap guarantee the copy is +* visible before the pagetable update. */ flush_cache_range (vma, mmun_start, mmun_end);page_add_anon_rmap (new_page, vma, mmun_start, true); -pmdp_huge_clear_flush_notify (vma, mmun_start, pmd); +/* +* At this point the pmd is numa/protnone (i.e. non present) and the TLB +* has already been flushed globally. So no TLB can be currently +* caching this non present pmd mapping. There's no need to clear the +* pmd before doing set_pmd_at(), nor to flush the TLB after +* set_pmd_at(). Clearing the pmd here would introduce a race +* condition against MADV_DONTNEED, because MADV_DONTNEED only holds the +* mmap_sem for reading. If the pmd is set to NULL at any given time, +* MADV_DONTNEED won't wait on the pmd lock and it'll skip clearing this +* pmd. +*/ set_pmd_at (mm, mmun_start, pmd, entry);update_mmu_cache_pmd (vma, address, &entry);
@@ -2070,7 +2081,7 @@ int migrate_misplaced_transhuge_page(struct mm_struct *mm,* No need to double call mmu_notifier->invalidate_range() callback as * the above pmdp_huge_clear_flush_notify() did already call it. */ -mmu_notifier_invalidate_range_only_end (mm, mmun_start, mmun_end); +mmu_notifier_invalidate_range_end (mm, mmun_start, mmun_end);/* Take an "isolate" reference and put new page on the LRU. */ get_page (new_page);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 133/237 mm: thp: fix mmu_notifier in migrate_misplaced_transhuge_page()
In reply to Sasha LevinFrom: Andrea Arcangeli <[email protected]>
[ Upstream commit 7066f0f933a1fd707bb38781866657769cff7efc ]
change_huge_pmd() after arming the numa/protnone pmd doesn't flush the TLB right away. do_huge_pmd_numa_page() flushes the TLB before calling migrate_misplaced_transhuge_page(). By the time do_huge_pmd_numa_page() runs some CPU could still access the page through the TLB.
change_huge_pmd() before arming the numa/protnone transhuge pmd calls mmu_notifier_invalidate_range_start(). So there's no need of mmu_notifier_invalidate_range_start()/mmu_notifier_invalidate_range_only_end() sequence in migrate_misplaced_transhuge_page() too, because by the time migrate_misplaced_transhuge_page() runs, the pmd mapping has already been invalidated in the secondary MMUs. It has to or if a secondary MMU can still write to the page, the migrate_page_copy() would lose data.
However an explicit mmu_notifier_invalidate_range() is needed before migrate_misplaced_transhuge_page() starts copying the data of the transhuge page or the below can happen for MMU notifier users sharing the primary MMU pagetables and only implementing ->invalidate_range:
CPU0 CPU1 GPU sharing linux pagetables using
only ->invalidate_range
----------- ------------ ---------
GPU secondary MMU writes to the page mapped by the transhuge pmdchange_pmd_range()
mmu..._range_start()
->invalidate_range_start() noopchange_huge_pmd()set_pmd_at(numa/protnone)pmd_unlock()
do_huge_pmd_numa_page()
CPU TLB flush globally (1)
CPU cannot write to page migrate_misplaced_transhuge_page()
GPU writes to the page...
migrate_page_copy()
...GPU stops writing to the page
CPU TLB flush (2)
mmu..._range_end() (3)
->invalidate_range_stop() noop
->invalidate_range()
GPU secondary MMU is invalidated and cannot write to the page anymore (too late)
Just like we need a CPU TLB flush (1) because the TLB flush (2) arrives too late, we also need a mmu_notifier_invalidate_range() before calling migrate_misplaced_transhuge_page(), because the ->invalidate_range() in
(3) also arrives too late.
This requirement is the result of the lazy optimization in change_huge_pmd() that releases the pmd_lock without first flushing the TLB and without first calling mmu_notifier_invalidate_range().
Even converting the removed mmu_notifier_invalidate_range_only_end() into a mmu_notifier_invalidate_range_end() would not have been enough to fix this, because it run after migrate_page_copy().
After the hugepage data copy is done migrate_misplaced_transhuge_page() can proceed and call set_pmd_at without having to flush the TLB nor any secondary MMUs because the secondary MMU invalidate, just like the CPU TLB flush, has to happen before the migrate_page_copy() is called or it would be a bug in the first place (and it was for drivers using ->invalidate_range()).
KVM is unaffected because it doesn't implement ->invalidate_range().
The standard PAGE_SIZEd migrate_misplaced_page is less accelerated and uses the generic migrate_pages which transitions the pte from numa/protnone to a migration entry in try_to_unmap_one() and flushes TLBs and all mmu notifiers there before copying the page.
--- mm/huge_memory.c | 14 +++++++++++++- mm/migrate.c | 19 ++++++------------- 2 files changed, 19 insertions(+), 14 deletions(-)
mm/huge_memory.c +13 -1
@@ -1603,8 +1603,20 @@ vm_fault_t do_huge_pmd_numa_page(struct vm_fault *vmf, pmd_t pmd)* We are not sure a pending tlb flush here is for a huge page * mapping or not. Hence use the tlb range variant */ -if (mm_tlb_flush_pending (vma->vm_mm)) +if (mm_tlb_flush_pending (vma->vm_mm)) {flush_tlb_range (vma, haddr, haddr +HPAGE_PMD_SIZE ); +/* +* change_huge_pmd() released the pmd lock before +* invalidating the secondary MMUs sharing the primary +* MMU pagetables (with ->invalidate_range()). The +* mmu_notifier_invalidate_range_end() (which +* internally calls ->invalidate_range()) in +* change_pmd_range() will run after us, so we can't +* rely on it here and we need an explicit invalidate. +*/ +mmu_notifier_invalidate_range (vma->vm_mm, haddr, + haddr +HPAGE_PMD_SIZE ); + }/* * Migrate the THP to the requested node, returns with page unlocked
mm/migrate.c +6 -13
@@ -1992,8 +1992,8 @@ int migrate_misplaced_transhuge_page(struct mm_struct *mm,int isolated =0 ;struct page *new_page =NULL ;int page_lru =page_is_file_cache (page); -unsigned long mmun_start = address &HPAGE_PMD_MASK ; -unsigned long mmun_end = mmun_start +HPAGE_PMD_SIZE ; +unsigned long start = address &HPAGE_PMD_MASK ; +unsigned long end = start +HPAGE_PMD_SIZE ; new_page = alloc_pages_node(node, (GFP_TRANSHUGE_LIGHT | __GFP_THISNODE),
@@ -2020,11 +2020,9 @@ int migrate_misplaced_transhuge_page(struct mm_struct *mm,WARN_ON (PageLRU (new_page));/* Recheck the target PMD */ -mmu_notifier_invalidate_range_start (mm, mmun_start, mmun_end); ptl =pmd_lock (mm, pmd);if (unlikely (!pmd_same (*pmd, entry) || !page_ref_freeze (page,2 ))) {spin_unlock (ptl); -mmu_notifier_invalidate_range_end (mm, mmun_start, mmun_end);/* Reverse changes made by migrate_page_copy() */ if (TestClearPageActive (new_page))
@@ -2055,8 +2053,8 @@ int migrate_misplaced_transhuge_page(struct mm_struct *mm,* new page and page_add_new_anon_rmap guarantee the copy is * visible before the pagetable update. */ -flush_cache_range (vma, mmun_start, mmun_end); -page_add_anon_rmap (new_page, vma, mmun_start, true); +flush_cache_range (vma, start, end); +page_add_anon_rmap (new_page, vma, start, true);/* * At this point the pmd is numa/protnone (i.e. non present) and the TLB * has already been flushed globally. So no TLB can be currently
@@ -2068,7 +2066,7 @@ int migrate_misplaced_transhuge_page(struct mm_struct *mm,* MADV_DONTNEED won't wait on the pmd lock and it'll skip clearing this * pmd. */ -set_pmd_at (mm, mmun_start, pmd, entry); +set_pmd_at (mm, start, pmd, entry);update_mmu_cache_pmd (vma, address, &entry);page_ref_unfreeze (page,2 );
@@ -2077,11 +2075,6 @@ int migrate_misplaced_transhuge_page(struct mm_struct *mm,set_page_owner_migrate_reason (new_page,MR_NUMA_MISPLACED );spin_unlock (ptl); -/* -* No need to double call mmu_notifier->invalidate_range() callback as -* the above pmdp_huge_clear_flush_notify() did already call it. -*/ -mmu_notifier_invalidate_range_end (mm, mmun_start, mmun_end);/* Take an "isolate" reference and put new page on the LRU. */ get_page (new_page);
@@ -2105,7 +2098,7 @@ int migrate_misplaced_transhuge_page(struct mm_struct *mm, ptl =pmd_lock (mm, pmd);if (pmd_same (*pmd, entry)) { entry =pmd_modify (entry, vma->vm_page_prot); -set_pmd_at (mm, mmun_start, pmd, entry); +set_pmd_at (mm, start, pmd, entry);update_mmu_cache_pmd (vma, address, &entry); }spin_unlock (ptl);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 134/237 macsec: update operstate when lower device changes
In reply to Sasha LevinFrom: Sabrina Dubroca <[email protected]>
[ Upstream commit e6ac075882b2afcdf2d5ab328ce4ab42a1eb9593 ]
Like all other virtual devices (macvlan, vlan), the operstate of a macsec device should match the state of its lower device. This is done by calling netif_stacked_transfer_operstate from its netdevice notifier.
We also need to call netif_stacked_transfer_operstate when a new macsec device is created, so that its operstate is set properly. This is only relevant when we try to bring the device up directly when we create it.
Radu Rendec proposed a similar patch, inspired from the 802.1q driver, that included changing the administrative state of the macsec device, instead of just the operstate. This version is similar to what the macvlan driver does, and updates only the operstate.
--- drivers/net/macsec.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
drivers/net/macsec.c +17 -0
@@ -3305,6 +3305,9 @@ static int macsec_newlink(struct net *net, struct net_device *dev,if (err <0 ) goto del_dev; +netif_stacked_transfer_operstate (real_dev, dev); +linkwatch_fire_event (dev); + macsec_generation++;return 0 ;
@@ -3489,6 +3492,20 @@ static int macsec_notify(struct notifier_block *this, unsigned long event,return NOTIFY_DONE ;switch (event) { +case NETDEV_DOWN : +case NETDEV_UP : +case NETDEV_CHANGE : { +struct macsec_dev *m, *n; +struct macsec_rxh_data *rxd; + + rxd =macsec_data_rtnl (real_dev); +list_for_each_entry_safe (m, n, &rxd->secys, secys) { +struct net_device *dev = m->secy.netdev; + +netif_stacked_transfer_operstate (real_dev, dev); + } +break ; + }case NETDEV_UNREGISTER : {struct macsec_dev *m, *n;struct macsec_rxh_data *rxd;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 135/237 macsec: let the administrator set UP state even if lowerdev is down
In reply to Sasha LevinFrom: Sabrina Dubroca <[email protected]>
[ Upstream commit 07bddef9839378bd6f95b393cf24c420529b4ef1 ]
Currently, the kernel doesn't let the administrator set a macsec device up unless its lower device is currently up. This is inconsistent, as a macsec device that is up won't automatically go down when its lower device goes down.
Now that linkstate propagation works, there's really no reason for this limitation, so let's remove it.
--- drivers/net/macsec.c | 3 --- 1 file changed, 3 deletions(-)
drivers/net/macsec.c +0 -3
@@ -2813,9 +2813,6 @@ static int macsec_dev_open(struct net_device *dev)struct net_device *real_dev = macsec->real_dev;int err; -if (!(real_dev->flags &IFF_UP )) -return -ENETDOWN ; - err =dev_uc_add (real_dev, dev->dev_addr);if (err <0 )return err;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 136/237 block: fix the DISCARD request merge
In reply to Sasha LevinFrom: Jianchao Wang <[email protected]>
[ Upstream commit 69840466086d2248898020a08dda52732686c4e6 ]
There are two cases when handle DISCARD merge.
If max_discard_segments == 1, the bios/requests need to be contiguous to merge. If max_discard_segments > 1, it takes every bio as a range and different range needn't to be contiguous.
But now, attempt_merge screws this up. It always consider contiguity for DISCARD for the case max_discard_segments > 1 and cannot merge contiguous DISCARD for the case max_discard_segments == 1, because rq_attempt_discard_merge always returns false in this case. This patch fixes both of the two cases above.
--- block/blk-merge.c | 46 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 36 insertions(+), 10 deletions(-)
block/blk-merge.c +36 -10
@@ -669,6 +669,31 @@ static void blk_account_io_merge(struct request *req)part_stat_unlock (); } } +/* +* Two cases of handling DISCARD merge: +* If max_discard_segments > 1, the driver takes every bio +* as a range and send them to controller together. The ranges +* needn't to be contiguous. +* Otherwise, the bios/requests will be handled as same as +* others which should be contiguous. +*/ +static inline bool blk_discard_mergable (struct request *req) +{ +if (req_op (req) ==REQ_OP_DISCARD && +queue_max_discard_segments (req->q) >1 ) +return true; +return false; +} + +enum elv_merge blk_try_req_merge (struct request *req,struct request *next) +{ +if (blk_discard_mergable (req)) +return ELEVATOR_DISCARD_MERGE ; +else if (blk_rq_pos (req) +blk_rq_sectors (req) ==blk_rq_pos (next)) +return ELEVATOR_BACK_MERGE ; + +return ELEVATOR_NO_MERGE ; +}/* * For non-mq, this has to be called with the request spinlock acquired.
@@ -686,12 +711,6 @@ static struct request *attempt_merge(struct request_queue *q,if (req_op (req) !=req_op (next))return NULL ; -/* -* not contiguous -*/ -if (blk_rq_pos (req) +blk_rq_sectors (req) !=blk_rq_pos (next)) -return NULL ; -if (rq_data_dir (req) !=rq_data_dir (next) || req->rq_disk != next->rq_disk ||req_no_special_merge (next))
@@ -715,11 +734,19 @@ static struct request *attempt_merge(struct request_queue *q,* counts here. Handle DISCARDs separately, as they * have separate settings. */ -if (req_op (req) ==REQ_OP_DISCARD ) { + +switch (blk_try_req_merge (req, next)) { +case ELEVATOR_DISCARD_MERGE :if (!req_attempt_discard_merge (q, req, next))return NULL ; - }else if (!ll_merge_requests_fn (q, req, next)) +break ; +case ELEVATOR_BACK_MERGE : +if (!ll_merge_requests_fn (q, req, next)) +return NULL ; +break ; +default :return NULL ; + }/* * If failfast settings disagree or any of the two is already
@@ -843,8 +870,7 @@ bool blk_rq_merge_ok(struct request *rq, struct bio *bio)enum elv_merge blk_try_merge (struct request *rq,struct bio *bio) { -if (req_op (rq) ==REQ_OP_DISCARD && -queue_max_discard_segments (rq->q) >1 ) +if (blk_discard_mergable (rq))return ELEVATOR_DISCARD_MERGE ;else if (blk_rq_pos (rq) +blk_rq_sectors (rq) == bio->bi_iter.bi_sector)return ELEVATOR_BACK_MERGE ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 137/237 i2c: uniphier-f: make driver robust against concurrency
In reply to Sasha LevinFrom: Masahiro Yamada <[email protected]>
[ Upstream commit f1fdcbbdf45d9609f3d4063b67e9ea941ba3a58f ]
This is unlikely to happen, but it is possible for a CPU to enter the interrupt handler just after wait_for_completion_timeout() has expired. If this happens, the hardware is accessed from multiple contexts concurrently.
Disable the IRQ after wait_for_completion_timeout(), and do nothing from the handler when the IRQ is disabled.
--- drivers/i2c/busses/i2c-uniphier-f.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)
drivers/i2c/busses/i2c-uniphier-f.c +16 -1
@@ -98,6 +98,7 @@ struct uniphier_fi2c_priv {unsigned int flags;unsigned int busy_cnt;unsigned int clk_cycle; +spinlock_t lock;/* IRQ synchronization */ }; static void uniphier_fi2c_fill_txfifo(struct uniphier_fi2c_priv *priv,
@@ -162,7 +163,10 @@ static irqreturn_t uniphier_fi2c_interrupt(int irq, void *dev_id)struct uniphier_fi2c_priv *priv = dev_id;u32 irq_status; +spin_lock (&priv->lock); + irq_status =readl (priv->membase +UNIPHIER_FI2C_INT ); + irq_status &= priv->enabled_irqs; dev_dbg(&priv->adap.dev, "interrupt: enabled_irqs=%04x, irq_status=%04x\n",
@@ -230,6 +234,8 @@ static irqreturn_t uniphier_fi2c_interrupt(int irq, void *dev_id) goto handled; } +spin_unlock (&priv->lock); +return IRQ_NONE ; data_done:
@@ -246,6 +252,8 @@ static irqreturn_t uniphier_fi2c_interrupt(int irq, void *dev_id) handled:uniphier_fi2c_clear_irqs (priv); +spin_unlock (&priv->lock); +return IRQ_HANDLED ; }
@@ -311,7 +319,7 @@ static int uniphier_fi2c_master_xfer_one(struct i2c_adapter *adap, {struct uniphier_fi2c_priv *priv =i2c_get_adapdata (adap);bool is_read = msg->flags &I2C_M_RD ; -unsigned long time_left; +unsigned long time_left, flags;dev_dbg (&adap->dev,"%s: addr=0x%02x, len=%d, stop=%d\n" , is_read ?"receive" :"transmit" , msg->addr, msg->len, stop);
@@ -342,6 +350,12 @@ static int uniphier_fi2c_master_xfer_one(struct i2c_adapter *adap, priv->membase + UNIPHIER_FI2C_CR); time_left =wait_for_completion_timeout (&priv->comp, adap->timeout); + +spin_lock_irqsave (&priv->lock, flags); + priv->enabled_irqs =0 ; +uniphier_fi2c_set_irqs (priv); +spin_unlock_irqrestore (&priv->lock, flags); +if (!time_left) {dev_err (&adap->dev,"transaction timeout.\n" );uniphier_fi2c_recover (priv);
@@ -546,6 +560,7 @@ static int uniphier_fi2c_probe(struct platform_device *pdev) priv->clk_cycle = clk_rate / bus_speed;init_completion (&priv->comp); +spin_lock_init (&priv->lock); priv->adap.owner =THIS_MODULE ; priv->adap.algo = &uniphier_fi2c_algo; priv->adap.dev.parent = dev;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 138/237 i2c: uniphier-f: fix occasional timeout error
In reply to Sasha LevinFrom: Masahiro Yamada <[email protected]>
[ Upstream commit 39226aaa85f002d695e3cafade3309e12ffdaecd ]
Currently, a timeout error could happen at a repeated START condition.
For a (non-repeated) START condition, the controller starts sending data when the UNIPHIER_FI2C_CR_STA bit is set. However, for a repeated START condition, the hardware starts running when the slave address is written to the TX FIFO - the write to the UNIPHIER_FI2C_CR register is actually unneeded.
Because the hardware is already running before the IRQ is enabled for a repeated START, the driver may miss the IRQ event. In most cases, this problem does not show up since modern CPUs are much faster than the I2C transfer. However, it is still possible that a context switch happens after the controller starts, but before the IRQ register is set up.
To fix this,
- Do not write UNIPHIER_FI2C_CR for repeated START conditions.
- Enable IRQ *before* writing the slave address to the TX FIFO.
- Disable IRQ for the current CPU while queuing up the TX FIFO; If the CPU is interrupted by some task, the interrupt handler might be invoked due to the empty TX FIFO before completing the setup.
--- drivers/i2c/busses/i2c-uniphier-f.c | 33 ++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 8 deletions(-)
drivers/i2c/busses/i2c-uniphier-f.c +25 -8
@@ -260,6 +260,8 @@ static irqreturn_t uniphier_fi2c_interrupt(int irq, void *dev_id)static void uniphier_fi2c_tx_init (struct uniphier_fi2c_priv *priv,u16 addr) { priv->enabled_irqs |=UNIPHIER_FI2C_INT_TE ; +uniphier_fi2c_set_irqs (priv); +/* do not use TX byte counter */ writel (0 , priv->membase +UNIPHIER_FI2C_TBC );/* set slave address */
@@ -292,6 +294,8 @@ static void uniphier_fi2c_rx_init(struct uniphier_fi2c_priv *priv, u16 addr) priv->enabled_irqs |=UNIPHIER_FI2C_INT_RF ; } +uniphier_fi2c_set_irqs (priv); +/* set slave address with RD bit */ writel (UNIPHIER_FI2C_DTTX_CMD |UNIPHIER_FI2C_DTTX_RD | addr <<1 , priv->membase +UNIPHIER_FI2C_DTTX );
@@ -315,14 +319,16 @@ static void uniphier_fi2c_recover(struct uniphier_fi2c_priv *priv) }static int uniphier_fi2c_master_xfer_one (struct i2c_adapter *adap, -struct i2c_msg *msg,bool stop) +struct i2c_msg *msg,bool repeat, +bool stop) {struct uniphier_fi2c_priv *priv =i2c_get_adapdata (adap);bool is_read = msg->flags &I2C_M_RD ;unsigned long time_left, flags; -dev_dbg (&adap->dev,"%s: addr=0x%02x, len=%d, stop=%d\n" , - is_read ?"receive" :"transmit" , msg->addr, msg->len, stop); +dev_dbg (&adap->dev,"%s: addr=0x%02x, len=%d, repeat=%d, stop=%d\n" , + is_read ?"receive" :"transmit" , msg->addr, msg->len, + repeat, stop); priv->len = msg->len; priv->buf = msg->buf;
@@ -338,16 +344,24 @@ static int uniphier_fi2c_master_xfer_one(struct i2c_adapter *adap,writel (UNIPHIER_FI2C_RST_TBRST |UNIPHIER_FI2C_RST_RBRST , priv->membase +UNIPHIER_FI2C_RST );/* reset TX/RX FIFO */ +spin_lock_irqsave (&priv->lock, flags); +if (is_read)uniphier_fi2c_rx_init (priv, msg->addr);else uniphier_fi2c_tx_init (priv, msg->addr); -uniphier_fi2c_set_irqs (priv); -dev_dbg (&adap->dev,"start condition\n" ); -writel (UNIPHIER_FI2C_CR_MST |UNIPHIER_FI2C_CR_STA , - priv->membase +UNIPHIER_FI2C_CR ); +/* +* For a repeated START condition, writing a slave address to the FIFO +* kicks the controller. So, the UNIPHIER_FI2C_CR register should be +* written only for a non-repeated START condition. +*/ +if (!repeat) +writel (UNIPHIER_FI2C_CR_MST |UNIPHIER_FI2C_CR_STA , + priv->membase +UNIPHIER_FI2C_CR ); + +spin_unlock_irqrestore (&priv->lock, flags); time_left =wait_for_completion_timeout (&priv->comp, adap->timeout);
@@ -408,6 +422,7 @@ static int uniphier_fi2c_master_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num) {struct i2c_msg *msg, *emsg = msgs + num; +bool repeat = false;int ret; ret =uniphier_fi2c_check_bus_busy (adap);
@@ -418,9 +433,11 @@ static int uniphier_fi2c_master_xfer(struct i2c_adapter *adap,/* Emit STOP if it is the last message or I2C_M_STOP is set. */ bool stop = (msg +1 == emsg) || (msg->flags &I2C_M_STOP ); - ret =uniphier_fi2c_master_xfer_one (adap, msg, stop); + ret =uniphier_fi2c_master_xfer_one (adap, msg, repeat, stop);if (ret)return ret; + + repeat = !stop; }return num;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 139/237 i2c: uniphier-f: fix race condition when IRQ is cleared
In reply to Sasha LevinFrom: Masahiro Yamada <[email protected]>
[ Upstream commit eaba68785c2d24ebf1f0d46c24e11b79cc2f94c7 ]
The current IRQ handler clears all the IRQ status bits when it bails out. This is dangerous because it might clear away the status bits that have just been set while processing the current handler. If this happens, the IRQ event for the latest transfer is lost forever.
The IRQ status bits must be cleared *before* the next transfer is kicked.
--- drivers/i2c/busses/i2c-uniphier-f.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/i2c/busses/i2c-uniphier-f.c +6 -5
@@ -143,9 +143,10 @@ static void uniphier_fi2c_set_irqs(struct uniphier_fi2c_priv *priv)writel (priv->enabled_irqs, priv->membase +UNIPHIER_FI2C_IE ); } -static void uniphier_fi2c_clear_irqs (struct uniphier_fi2c_priv *priv) +static void uniphier_fi2c_clear_irqs (struct uniphier_fi2c_priv *priv, +u32 mask) { -writel (-1 , priv->membase +UNIPHIER_FI2C_IC ); +writel (mask, priv->membase +UNIPHIER_FI2C_IC ); }static void uniphier_fi2c_stop (struct uniphier_fi2c_priv *priv)
@@ -172,6 +173,8 @@ static irqreturn_t uniphier_fi2c_interrupt(int irq, void *dev_id)"interrupt: enabled_irqs=%04x, irq_status=%04x\n" , priv->enabled_irqs, irq_status); +uniphier_fi2c_clear_irqs (priv, irq_status); +if (irq_status &UNIPHIER_FI2C_INT_STOP ) goto complete;
@@ -250,8 +253,6 @@ static irqreturn_t uniphier_fi2c_interrupt(int irq, void *dev_id) } handled: -uniphier_fi2c_clear_irqs (priv); -spin_unlock (&priv->lock);return IRQ_HANDLED ;
@@ -340,7 +341,7 @@ static int uniphier_fi2c_master_xfer_one(struct i2c_adapter *adap, priv->flags |=UNIPHIER_FI2C_STOP ;reinit_completion (&priv->comp); -uniphier_fi2c_clear_irqs (priv); +uniphier_fi2c_clear_irqs (priv,U32_MAX );writel (UNIPHIER_FI2C_RST_TBRST |UNIPHIER_FI2C_RST_RBRST , priv->membase +UNIPHIER_FI2C_RST );/* reset TX/RX FIFO */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 140/237 um: Make line/tty semantics use true write IRQ
In reply to Sasha LevinFrom: Anton Ivanov <[email protected]>
[ Upstream commit 917e2fd2c53eb3c4162f5397555cbd394390d4bc ]
This fixes a long standing bug where large amounts of output could freeze the tty (most commonly seen on stdio console). While the bug has always been there it became more pronounced after moving to the new interrupt controller.
The line semantics are now changed to have true IRQ write semantics which should further improve the tty/line subsystem stability and performance
--- arch/um/drivers/line.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/um/drivers/line.c +2 -2
@@ -261,7 +261,7 @@ static irqreturn_t line_write_interrupt(int irq, void *data)if (err ==0 ) {spin_unlock (&line->lock);return IRQ_NONE ; - }else if (err <0 ) { + }else if ((err <0 ) && (err != -EAGAIN )) { line->head = line->buffer; line->tail = line->buffer; }
@@ -284,7 +284,7 @@ int line_setup_irq(int fd, int input, int output, struct line *line, void *data)if (err)return err;if (output) - err =um_request_irq (driver->write_irq, fd,IRQ_NONE , + err =um_request_irq (driver->write_irq, fd,IRQ_WRITE , line_write_interrupt,IRQF_SHARED , driver->write_irq_name, data);return err;
Signature · 7 lines
2.20.1 _______________________________________________ linux-um mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-um
Sasha Levin
maintainerPATCH 141/237 vfs: avoid problematic remapping requests into partial EOF block
In reply to Sasha LevinFrom: "Darrick J. Wong" <[email protected]>
[ Upstream commit 07d19dc9fbe9128378b9e226abe886fd8fd473df ]
A deduplication data corruption is exposed in XFS and btrfs. It is caused by extending the block match range to include the partial EOF block, but then allowing unknown data beyond EOF to be considered a "match" to data in the destination file because the comparison is only made to the end of the source file. This corrupts the destination file when the source extent is shared with it.
The VFS remapping prep functions only support whole block dedupe, but we still need to appear to support whole file dedupe correctly. Hence if the dedupe request includes the last block of the souce file, don't include it in the actual dedupe operation. If the rest of the range dedupes successfully, then reject the entire request. A subsequent patch will enable us to shorten dedupe requests correctly.
When reflinking sub-file ranges, a data corruption can occur when the source file range includes a partial EOF block. This shares the unknown data beyond EOF into the second file at a position inside EOF, exposing stale data in the second file.
If the reflink request includes the last block of the souce file, only proceed with the reflink operation if it lands at or past the destination file's current EOF. If it lands within the destination file EOF, reject the entire request with -EINVAL and make the caller go the hard way. A subsequent patch will enable us to shorten reflink requests correctly.
--- fs/read_write.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+)
fs/read_write.c +33 -0
@@ -1715,6 +1715,34 @@ static int clone_verify_area(struct file *file, loff_t pos, u64 len, bool write)return security_file_permission (file, write ?MAY_WRITE :MAY_READ ); } +/* +* Ensure that we don't remap a partial EOF block in the middle of something +* else. Assume that the offsets have already been checked for block +* alignment. +* +* For deduplication we always scale down to the previous block because we +* can't meaningfully compare post-EOF contents. +* +* For clone we only link a partial EOF block above the destination file's EOF. +*/ +static int generic_remap_check_len (struct inode *inode_in, +struct inode *inode_out, +loff_t pos_out, +u64 *len, +bool is_dedupe) +{ +u64 blkmask =i_blocksize (inode_in) -1 ; + +if ((*len & blkmask) ==0 ) +return 0 ; + +if (is_dedupe) + *len &= ~blkmask; +else if (pos_out + *len <i_size_read (inode_out)) +return -EINVAL ; + +return 0 ; +}/* * Check that the two inodes are eligible for cloning, the ranges make
@@ -1821,6 +1849,11 @@ int vfs_clone_file_prep_inodes(struct inode *inode_in, loff_t pos_in,return -EBADE ; } + ret =generic_remap_check_len (inode_in, inode_out, pos_out, len, + is_dedupe); +if (ret) +return ret; +return 1 ; }EXPORT_SYMBOL (vfs_clone_file_prep_inodes);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 142/237 ipv4/igmp: fix v1/v2 switchback timeout based on rfc3376, 8.12
In reply to Sasha LevinFrom: Hangbin Liu <[email protected]>
[ Upstream commit 966c37f2d77eb44d47af8e919267b1ba675b2eca ]
Similiar with ipv6 mcast commit 89225d1ce6af3 ("net: ipv6: mld: fix v1/v2 switchback timeout to rfc3810, 9.12.")
i) RFC3376 8.12. Older Version Querier Present Timeout says:
The Older Version Querier Interval is the time-out for transitioning a host back to IGMPv3 mode once an older version query is heard. When an older version query is received, hosts set their Older Version Querier Present Timer to Older Version Querier Interval.
This value MUST be ((the Robustness Variable) times (the Query Interval in the last Query received)) plus (one Query Response Interval).
Currently we only use a hardcode value IGMP_V1/v2_ROUTER_PRESENT_TIMEOUT. Fix it by adding two new items mr_qi(Query Interval) and mr_qri(Query Response Interval) in struct in_device.
Now we can calculate the switchback time via (mr_qrv * mr_qi) + mr_qri. We need update these values when receive IGMPv3 queries.
--- include/linux/inetdevice.h | 4 ++- net/ipv4/igmp.c | 53 ++++++++++++++++++++++++++------------ 2 files changed, 39 insertions(+), 18 deletions(-)
include/linux/inetdevice.h +3 -1
@@ -37,7 +37,9 @@ struct in_device {unsigned long mr_v1_seen;unsigned long mr_v2_seen;unsigned long mr_maxdelay; -unsigned char mr_qrv; +unsigned long mr_qi;/* Query Interval */ +unsigned long mr_qri;/* Query Response Interval */ +unsigned char mr_qrv;/* Query Robustness Variable */ unsigned char mr_gq_running;unsigned char mr_ifc_count;struct timer_list mr_gq_timer;/* general query timer */
net/ipv4/igmp.c +36 -17
103 lines not on this page · raw message
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 143/237 powerpc/xmon: Relax frame size for clang
In reply to Sasha LevinFrom: Joel Stanley <[email protected]>
[ Upstream commit 9c87156cce5a63735d1218f0096a65c50a7a32aa ]
When building with clang (8 trunk, 7.0 release) the frame size limit is hit:
arch/powerpc/xmon/xmon.c:452:12: warning: stack frame size of 2576 bytes in function 'xmon_core' [-Wframe-larger-than=]
Some investigation by Naveen indicates this is due to clang saving the addresses to printf format strings on the stack.
While this issue is investigated, bump up the frame size limit for xmon when building with clang.
--- arch/powerpc/xmon/Makefile | 6 ++++++ 1 file changed, 6 insertions(+)
arch/powerpc/xmon/Makefile +6 -0
@@ -13,6 +13,12 @@ UBSAN_SANITIZE := n ORIG_CFLAGS := $(KBUILD_CFLAGS) KBUILD_CFLAGS = $(subst $(CC_FLAGS_FTRACE),,$(ORIG_CFLAGS)) +ifdef CONFIG_CC_IS_CLANG +# clang stores addresses on the stack causing the frame size to blow +# out. See https://github.com/ClangBuiltLinux/linux/issues/252 +KBUILD_CFLAGS += -Wframe-larger-than=4096 +endif + ccflags-$(CONFIG_PPC64) := $(NO_MINIMAL_TOC) obj-y += xmon.o nonstdio.o spr_access.o
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 144/237 selftests/powerpc/ptrace: Fix out-of-tree build
In reply to Sasha LevinFrom: Joel Stanley <[email protected]>
[ Upstream commit c39b79082a38a4f8c801790edecbbb4d62ed2992 ]
We should use TEST_GEN_PROGS, not TEST_PROGS. That tells the selftests makefile (lib.mk) that those tests are generated (built), and so it adds the $(OUTPUT) prefix for us, making the out-of-tree build work correctly.
It also means we don't need our own clean rule, lib.mk does it.
We also have to update the ptrace-pkey and core-pkey rules to use $(OUTPUT).
--- tools/testing/selftests/powerpc/ptrace/Makefile | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-)
tools/testing/selftests/powerpc/ptrace/Makefile +4 -9
@@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -TEST_PROGS := ptrace-gpr ptrace-tm-gpr ptrace-tm-spd-gpr \ +TEST_GEN_PROGS := ptrace-gpr ptrace-tm-gpr ptrace-tm-spd-gpr \ ptrace-tar ptrace-tm-tar ptrace-tm-spd-tar ptrace-vsx ptrace-tm-vsx \ ptrace-tm-spd-vsx ptrace-tm-spr ptrace-hwbreak ptrace-pkey core-pkey \ perf-hwbreak
@@ -7,14 +7,9 @@ TEST_PROGS := ptrace-gpr ptrace-tm-gpr ptrace-tm-spd-gpr \ top_srcdir = ../../../../.. include ../../lib.mk -all: $(TEST_PROGS) - CFLAGS += -m64 -I../../../../../usr/include -I../tm -mhtm -fno-pie -ptrace-pkey core-pkey: child.h -ptrace-pkey core-pkey: LDLIBS += -pthread - -$(TEST_PROGS): ../harness.c ../utils.c ../lib/reg.S ptrace.h +$(OUTPUT)/ptrace-pkey $(OUTPUT)/core-pkey: child.h +$(OUTPUT)/ptrace-pkey $(OUTPUT)/core-pkey: LDLIBS += -pthread -clean: - rm -f $(TEST_PROGS) *.o +$(TEST_GEN_PROGS): ../harness.c ../utils.c ../lib/reg.S ptrace.h
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 145/237 selftests/powerpc/signal: Fix out-of-tree build
In reply to Sasha LevinFrom: Joel Stanley <[email protected]>
[ Upstream commit 27825349d7b238533a47e3d98b8bb0efd886b752 ]
We should use TEST_GEN_PROGS, not TEST_PROGS. That tells the selftests makefile (lib.mk) that those tests are generated (built), and so it adds the $(OUTPUT) prefix for us, making the out-of-tree build work correctly.
It also means we don't need our own clean rule, lib.mk does it.
We also have to update the signal_tm rule to use $(OUTPUT).
--- tools/testing/selftests/powerpc/signal/Makefile | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
tools/testing/selftests/powerpc/signal/Makefile +3 -8
@@ -1,15 +1,10 @@ # SPDX-License-Identifier: GPL-2.0 -TEST_PROGS := signal signal_tm - -all: $(TEST_PROGS) - -$(TEST_PROGS): ../harness.c ../utils.c signal.S +TEST_GEN_PROGS := signal signal_tm CFLAGS += -maltivec -signal_tm: CFLAGS += -mhtm +$(OUTPUT)/signal_tm: CFLAGS += -mhtm top_srcdir = ../../../../.. include ../../lib.mk -clean: - rm -f $(TEST_PROGS) *.o +$(TEST_GEN_PROGS): ../harness.c ../utils.c signal.S
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 146/237 selftests/powerpc/switch_endian: Fix out-of-tree build
In reply to Sasha LevinFrom: Michael Ellerman <[email protected]>
[ Upstream commit 266bac361d5677e61a6815bd29abeb3bdced2b07 ]
For the out-of-tree build to work we need to tell switch_endian_test to look for check-reversed.S in $(OUTPUT).
--- tools/testing/selftests/powerpc/switch_endian/Makefile | 1 + 1 file changed, 1 insertion(+)
tools/testing/selftests/powerpc/switch_endian/Makefile +1 -0
@@ -8,6 +8,7 @@ EXTRA_CLEAN = $(OUTPUT)/*.o $(OUTPUT)/check-reversed.S top_srcdir = ../../../../.. include ../../lib.mk +$(OUTPUT)/switch_endian_test: ASFLAGS += -I $(OUTPUT) $(OUTPUT)/switch_endian_test: $(OUTPUT)/check-reversed.S $(OUTPUT)/check-reversed.o: $(OUTPUT)/check.o
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 147/237 selftests/powerpc/cache_shape: Fix out-of-tree build
In reply to Sasha LevinFrom: Michael Ellerman <[email protected]>
[ Upstream commit 69f8117f17b332a68cd8f4bf8c2d0d3d5b84efc5 ]
Use TEST_GEN_PROGS and don't redefine all, this makes the out-of-tree build work. We need to move the extra dependencies below the include of lib.mk, because it adds the $(OUTPUT) prefix if it's defined.
We can also drop the clean rule, lib.mk does it for us.
--- tools/testing/selftests/powerpc/cache_shape/Makefile | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
tools/testing/selftests/powerpc/cache_shape/Makefile +2 -7
@@ -1,12 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 -TEST_PROGS := cache_shape - -all: $(TEST_PROGS) - -$(TEST_PROGS): ../harness.c ../utils.c +TEST_GEN_PROGS := cache_shape top_srcdir = ../../../../.. include ../../lib.mk -clean: - rm -f $(TEST_PROGS) *.o +$(TEST_GEN_PROGS): ../harness.c ../utils.c
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 148/237 block: call rq_qos_exit() after queue is frozen
In reply to Sasha LevinFrom: Ming Lei <[email protected]>
[ Upstream commit c57cdf7a9e51d97a43e29b8f4a04157875104000 ]
rq_qos_exit() removes the current q->rq_qos, this action has to be done after queue is frozen, otherwise the IO queue path may never be waken up, then IO hang is caused.
So fixes this issue by moving rq_qos_exit() after queue is frozen.
--- block/blk-core.c | 3 +++ block/blk-sysfs.c | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-)
block/blk-core.c +3 -0
@@ -784,6 +784,9 @@ void blk_cleanup_queue(struct request_queue *q)* prevent that q->request_fn() gets invoked after draining finished. */ blk_freeze_queue (q); + +rq_qos_exit (q); +spin_lock_irq (lock);queue_flag_set (QUEUE_FLAG_DEAD , q);spin_unlock_irq (lock);
block/blk-sysfs.c +0 -2
@@ -997,8 +997,6 @@ void blk_unregister_queue(struct gendisk *disk)kobject_del (&q->kobj);blk_trace_remove_sysfs (disk_to_dev (disk)); -rq_qos_exit (q); -mutex_lock (&q->sysfs_lock);if (q->request_fn || (q->mq_ops && q->elevator))elv_unregister_queue (q);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 149/237 mm/gup_benchmark.c: prevent integer overflow in ioctl
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit 4b408c74ee5a0b74fc9265c2fe39b0e7dec7c056 ]
The concern here is that "gup->size" is a u64 and "nr_pages" is unsigned long. On 32 bit systems we could trick the kernel into allocating fewer pages than expected.
--- mm/gup_benchmark.c | 3 +++ 1 file changed, 3 insertions(+)
mm/gup_benchmark.c +3 -0
@@ -23,6 +23,9 @@ static int __gup_benchmark_ioctl(unsigned int cmd,int nr;struct page **pages; +if (gup->size >ULONG_MAX ) +return -EINVAL ; + nr_pages = gup->size /PAGE_SIZE ; pages =kvcalloc (nr_pages,sizeof (void *),GFP_KERNEL );if (!pages)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 150/237 linux/bitmap.h: handle constant zero-size bitmaps correctly
In reply to Sasha LevinFrom: Rasmus Villemoes <[email protected]>
[ Upstream commit 7275b097851a5e2e0dd4da039c7e96b59ac5314e ]
The static inlines in bitmap.h do not handle a compile-time constant nbits==0 correctly (they dereference the passed src or dst pointers, despite only 0 words being valid to access). I had the 0-day buildbot chew on a patch [1] that would cause build failures for such cases without complaining, suggesting that we don't have any such users currently, at least for the 70 .config/arch combinations that was built. Should any turn up, make sure they use the out-of-line versions, which do handle nbits==0 correctly.
This is of course not the most efficient, but it's much less churn than teaching all the static inlines an "if (zero_const_nbits())", and since we don't have any current instances, this doesn't affect existing code at all.
[1] lkml.kernel.org/r/[email protected]
--- include/linux/bitmap.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
include/linux/bitmap.h +6 -1
@@ -204,8 +204,13 @@ extern int bitmap_print_to_pagebuf(bool list, char *buf,#define BITMAP_FIRST_WORD_MASK (start) (~0UL << ((start) & (BITS_PER_LONG - 1)))#define BITMAP_LAST_WORD_MASK (nbits) (~0UL >> (-(nbits) & (BITS_PER_LONG - 1))) +/* +* The static inlines below do not handle constant nbits==0 correctly, +* so make such users (should any ever turn up) call the out-of-line +* versions. +*/ #define small_const_nbits (nbits) \ - (__builtin_constant_p(nbits) && (nbits) <= BITS_PER_LONG) + (__builtin_constant_p(nbits) && (nbits) <= BITS_PER_LONG && (nbits) > 0)static inline void bitmap_zero (unsigned long *dst,unsigned int nbits) {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 151/237 linux/bitmap.h: fix type of nbits in bitmap_shift_right()
In reply to Sasha LevinFrom: Rasmus Villemoes <[email protected]>
[ Upstream commit d9873969fa8725dc6a5a21ab788c057fd8719751 ]
Most other bitmap API, including the OOL version __bitmap_shift_right, take unsigned nbits. This was accidentally left out from 2fbad29917c98.
--- include/linux/bitmap.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/bitmap.h +1 -1
@@ -403,7 +403,7 @@ static __always_inline void bitmap_clear(unsigned long *map, unsigned int start, }static inline void bitmap_shift_right (unsigned long *dst,const unsigned long *src, -unsigned int shift,int nbits) +unsigned int shift,unsigned int nbits) {if (small_const_nbits (nbits)) *dst = (*src &BITMAP_LAST_WORD_MASK (nbits)) >> shift;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 152/237 lib/bitmap.c: fix remaining space computation in bitmap_print_to_pagebuf
In reply to Sasha LevinFrom: Rasmus Villemoes <[email protected]>
[ Upstream commit ce1091d471107dbf6f91db66a480a25950c9b9ff ]
For various alignments of buf, the current expression computes
4096 ok
4095 ok
8190
8189
...
4097
i.e., if the caller has already written two bytes into the page buffer, len is 8190 rather than 4094, because PTR_ALIGN aligns up to the next boundary. So if the printed version of the bitmap is huge, scnprintf() ends up writing beyond the page boundary.
I don't think any current callers actually write anything before bitmap_print_to_pagebuf, but the API seems to be designed to allow it.
--- lib/bitmap.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
lib/bitmap.c +6 -4
@@ -13,6 +13,7 @@#include <linux/bitops.h> #include <linux/bug.h> #include <linux/kernel.h> +#include <linux/mm.h> #include <linux/slab.h> #include <linux/string.h> #include <linux/uaccess.h>
@@ -466,14 +467,15 @@ EXPORT_SYMBOL(bitmap_parse_user);* ranges if list is specified or hex digits grouped into comma-separated * sets of 8 digits/set. Returns the number of characters written to buf. * -* It is assumed that @buf is a pointer into a PAGE_SIZE area and that -* sufficient storage remains at @buf to accommodate the -* bitmap_print_to_pagebuf() output. +* It is assumed that @buf is a pointer into a PAGE_SIZE, page-aligned +* area and that sufficient storage remains at @buf to accommodate the +* bitmap_print_to_pagebuf() output. Returns the number of characters +* actually printed to @buf, excluding terminating '\0'. */ int bitmap_print_to_pagebuf (bool list,char *buf,const unsigned long *maskp,int nmaskbits) { -ptrdiff_t len =PTR_ALIGN (buf +PAGE_SIZE -1 ,PAGE_SIZE ) - buf; +ptrdiff_t len =PAGE_SIZE -offset_in_page (buf);int n =0 ;if (len >1 )
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 153/237 hfsplus: fix BUG on bnode parent update
In reply to Sasha LevinFrom: Ernesto A. Fernández <[email protected]>
[ Upstream commit 19a9d0f1acf75e8be8cfba19c1a34e941846fa2b ]
Creating, renaming or deleting a file may hit BUG_ON() if the first record of both a leaf node and its parent are changed, and if this forces the parent to be split. This bug is triggered by xfstests generic/027, somewhat rarely; here is a more reliable reproducer:
truncate -s 50M fs.iso
mkfs.hfsplus fs.iso
mount fs.iso /mnt
i=1000
while [ $i -le 2400 ]; do
touch /mnt/$i &>/dev/null
((++i))
done
i=2400
while [ $i -ge 1000 ]; do
mv /mnt/$i /mnt/$(perl -e "print $i x61") &>/dev/null
((--i))
doneThe issue is that a newly created bnode is being put twice. Reset new_node to NULL in hfs_brec_update_parent() before reaching goto again.
--- fs/hfsplus/brec.c | 1 + 1 file changed, 1 insertion(+)
fs/hfsplus/brec.c +1 -0
@@ -449,6 +449,7 @@ static int hfs_brec_update_parent(struct hfs_find_data *fd)/* restore search_key */ hfs_bnode_read_key (node, fd->search_key,14 ); } + new_node =NULL ; }if (!rec && node->parent)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 154/237 hfs: fix BUG on bnode parent update
In reply to Sasha LevinFrom: Ernesto A. Fernández <[email protected]>
[ Upstream commit ef75bcc5763d130451a99825f247d301088b790b ]
hfs_brec_update_parent() may hit BUG_ON() if the first record of both a leaf node and its parent are changed, and if this forces the parent to be split. It is not possible for this to happen on a valid hfs filesystem because the index nodes have fixed length keys.
For reasons I ignore, the hfs module does have support for a number of hfsplus features. A corrupt btree header may report variable length keys and trigger this BUG, so it's better to fix it.
--- fs/hfs/brec.c | 1 + 1 file changed, 1 insertion(+)
fs/hfs/brec.c +1 -0
@@ -445,6 +445,7 @@ static int hfs_brec_update_parent(struct hfs_find_data *fd)/* restore search_key */ hfs_bnode_read_key (node, fd->search_key,14 ); } + new_node =NULL ; }if (!rec && node->parent)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 155/237 hfsplus: prevent btree data loss on ENOSPC
In reply to Sasha LevinFrom: Ernesto A. Fernández <[email protected]>
[ Upstream commit d92915c35bfaf763d78bf1d5ac7f183420e3bd99 ]
Inserting or deleting a record in a btree may require splitting several of its nodes. If we hit ENOSPC halfway through, the new nodes will be left orphaned and their records will be lost. This could mean lost inodes, extents or xattrs.
Henceforth, check the available disk space before making any changes. This still leaves the potential problem of corruption on ENOMEM.
The patch can be tested with xfstests generic/027.
--- fs/hfsplus/attributes.c | 10 ++++++++++ fs/hfsplus/btree.c | 44 ++++++++++++++++++++++++++--------------- fs/hfsplus/catalog.c | 24 ++++++++++++++++++++++ fs/hfsplus/extents.c | 4 ++++ fs/hfsplus/hfsplus_fs.h | 2 ++ 5 files changed, 68 insertions(+), 16 deletions(-)
fs/hfsplus/attributes.c +10 -0
@@ -217,6 +217,11 @@ int hfsplus_create_attr(struct inode *inode,if (err) goto failed_init_create_attr; +/* Fail early and avoid ENOSPC during the btree operation */ + err =hfs_bmap_reserve (fd.tree, fd.tree->depth +1 ); +if (err) + goto failed_create_attr; +if (name) { err =hfsplus_attr_build_key (sb, fd.search_key, inode->i_ino, name);
@@ -313,6 +318,11 @@ int hfsplus_delete_attr(struct inode *inode, const char *name)if (err)return err; +/* Fail early and avoid ENOSPC during the btree operation */ + err =hfs_bmap_reserve (fd.tree, fd.tree->depth); +if (err) + goto out; +if (name) { err =hfsplus_attr_build_key (sb, fd.search_key, inode->i_ino, name);
fs/hfsplus/btree.c +28 -16
63 lines not on this page · raw message
fs/hfsplus/catalog.c +24 -0
@@ -265,6 +265,14 @@ int hfsplus_create_cat(u32 cnid, struct inode *dir,if (err)return err; +/* +* Fail early and avoid ENOSPC during the btree operations. We may +* have to split the root node at most once. +*/ + err =hfs_bmap_reserve (fd.tree,2 * fd.tree->depth); +if (err) + goto err2; +hfsplus_cat_build_key_with_cnid (sb, fd.search_key, cnid); entry_size = hfsplus_fill_cat_thread(sb, &entry, S_ISDIR(inode->i_mode) ?
@@ -333,6 +341,14 @@ int hfsplus_delete_cat(u32 cnid, struct inode *dir, const struct qstr *str)if (err)return err; +/* +* Fail early and avoid ENOSPC during the btree operations. We may +* have to split the root node at most once. +*/ + err =hfs_bmap_reserve (fd.tree,2 * (int )fd.tree->depth -2 ); +if (err) + goto out; +if (!str) {int len;
@@ -433,6 +449,14 @@ int hfsplus_rename_cat(u32 cnid,return err; dst_fd = src_fd; +/* +* Fail early and avoid ENOSPC during the btree operations. We may +* have to split the root node at most twice. +*/ + err =hfs_bmap_reserve (src_fd.tree,4 * (int )src_fd.tree->depth -1 ); +if (err) + goto out; +/* find the old dir entry and read the data */ err =hfsplus_cat_build_key (sb, src_fd.search_key, src_dir->i_ino, src_name);
fs/hfsplus/extents.c +4 -0
@@ -100,6 +100,10 @@ static int __hfsplus_ext_write_extent(struct inode *inode,if (hip->extent_state &HFSPLUS_EXT_NEW ) {if (res != -ENOENT )return res; +/* Fail early and avoid ENOSPC during the btree operation */ + res =hfs_bmap_reserve (fd->tree, fd->tree->depth +1 ); +if (res) +return res;hfs_brec_insert (fd, hip->cached_extents,sizeof (hfsplus_extent_rec)); hip->extent_state &= ~(HFSPLUS_EXT_DIRTY |HFSPLUS_EXT_NEW );
fs/hfsplus/hfsplus_fs.h +2 -0
@@ -311,6 +311,7 @@ static inline unsigned short hfsplus_min_io_size(struct super_block *sb)#define hfs_btree_open hfsplus_btree_open#define hfs_btree_close hfsplus_btree_close#define hfs_btree_write hfsplus_btree_write +#define hfs_bmap_reserve hfsplus_bmap_reserve#define hfs_bmap_alloc hfsplus_bmap_alloc#define hfs_bmap_free hfsplus_bmap_free#define hfs_bnode_read hfsplus_bnode_read
@@ -395,6 +396,7 @@ u32 hfsplus_calc_btree_clump_size(u32 block_size, u32 node_size, u64 sectors,struct hfs_btree *hfs_btree_open (struct super_block *sb,u32 id);void hfs_btree_close (struct hfs_btree *tree);int hfs_btree_write (struct hfs_btree *tree); +int hfs_bmap_reserve (struct hfs_btree *tree,int rsvd_nodes);struct hfs_bnode *hfs_bmap_alloc (struct hfs_btree *tree);void hfs_bmap_free (struct hfs_bnode *node);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 156/237 hfs: prevent btree data loss on ENOSPC
In reply to Sasha LevinFrom: Ernesto A. Fernández <[email protected]>
[ Upstream commit 54640c7502e5ed41fbf4eedd499e85f9acc9698f ]
Inserting a new record in a btree may require splitting several of its nodes. If we hit ENOSPC halfway through, the new nodes will be left orphaned and their records will be lost. This could mean lost inodes or extents.
Henceforth, check the available disk space before making any changes. This still leaves the potential problem of corruption on ENOMEM.
There is no need to reserve space before deleting a catalog record, as we do for hfsplus. This difference is because hfs index nodes have fixed length keys.
--- fs/hfs/btree.c | 41 +++++++++++++++++++++++++---------------- fs/hfs/btree.h | 1 + fs/hfs/catalog.c | 16 ++++++++++++++++ fs/hfs/extent.c | 4 ++++ 4 files changed, 46 insertions(+), 16 deletions(-)
fs/hfs/btree.c +25 -16
@@ -220,25 +220,17 @@ static struct hfs_bnode *hfs_bmap_new_bmap(struct hfs_bnode *prev, u32 idx)return node; } -struct hfs_bnode *hfs_bmap_alloc (struct hfs_btree *tree) +/* Make sure @tree has enough space for the @rsvd_nodes */ +int hfs_bmap_reserve (struct hfs_btree *tree,int rsvd_nodes) { -struct hfs_bnode *node, *next_node; -struct page **pagep; -u32 nidx, idx; -unsigned off; -u16 off16; -u16 len; -u8 *data, byte, m; -int i; - -while (!tree->free_nodes) { -struct inode *inode = tree->inode; -u32 count; -int res; +struct inode *inode = tree->inode; +u32 count; +int res; +while (tree->free_nodes < rsvd_nodes) { res =hfs_extend_file (inode);if (res) -return ERR_PTR (res); +return res;HFS_I (inode)->phys_size = inode->i_size = (loff_t )HFS_I (inode)->alloc_blocks *HFS_SB (tree->sb)->alloc_blksz;
@@ -246,9 +238,26 @@ struct hfs_bnode *hfs_bmap_alloc(struct hfs_btree *tree) tree->sb->s_blocksize_bits;inode_set_bytes (inode, inode->i_size); count = inode->i_size >> tree->node_size_shift; - tree->free_nodes = count - tree->node_count; + tree->free_nodes += count - tree->node_count; tree->node_count = count; } +return 0 ; +} + +struct hfs_bnode *hfs_bmap_alloc (struct hfs_btree *tree) +{ +struct hfs_bnode *node, *next_node; +struct page **pagep; +u32 nidx, idx; +unsigned off; +u16 off16; +u16 len; +u8 *data, byte, m; +int i, res; + + res =hfs_bmap_reserve (tree,1 ); +if (res) +return ERR_PTR (res); nidx =0 ; node =hfs_bnode_find (tree, nidx);
fs/hfs/btree.h +1 -0
@@ -82,6 +82,7 @@ struct hfs_find_data {extern struct hfs_btree *hfs_btree_open (struct super_block *,u32 ,btree_keycmp );extern void hfs_btree_close (struct hfs_btree *);extern void hfs_btree_write (struct hfs_btree *); +extern int hfs_bmap_reserve (struct hfs_btree *,int );extern struct hfs_bnode *hfs_bmap_alloc (struct hfs_btree *);extern void hfs_bmap_free (struct hfs_bnode *node);
fs/hfs/catalog.c +16 -0
@@ -97,6 +97,14 @@ int hfs_cat_create(u32 cnid, struct inode *dir, const struct qstr *str, struct iif (err)return err; +/* +* Fail early and avoid ENOSPC during the btree operations. We may +* have to split the root node at most once. +*/ + err =hfs_bmap_reserve (fd.tree,2 * fd.tree->depth); +if (err) + goto err2; +hfs_cat_build_key (sb, fd.search_key, cnid,NULL ); entry_size = hfs_cat_build_thread(sb, &entry, S_ISDIR(inode->i_mode) ? HFS_CDR_THD : HFS_CDR_FTH,
@@ -295,6 +303,14 @@ int hfs_cat_move(u32 cnid, struct inode *src_dir, const struct qstr *src_name,return err; dst_fd = src_fd; +/* +* Fail early and avoid ENOSPC during the btree operations. We may +* have to split the root node at most once. +*/ + err =hfs_bmap_reserve (src_fd.tree,2 * src_fd.tree->depth); +if (err) + goto out; +/* find the old dir entry and read the data */ hfs_cat_build_key (sb, src_fd.search_key, src_dir->i_ino, src_name); err =hfs_brec_find (&src_fd);
fs/hfs/extent.c +4 -0
@@ -117,6 +117,10 @@ static int __hfs_ext_write_extent(struct inode *inode, struct hfs_find_data *fd)if (HFS_I (inode)->flags &HFS_FLG_EXT_NEW ) {if (res != -ENOENT )return res; +/* Fail early and avoid ENOSPC during the btree operation */ + res =hfs_bmap_reserve (fd->tree, fd->tree->depth +1 ); +if (res) +return res;hfs_brec_insert (fd,HFS_I (inode)->cached_extents,sizeof (hfs_extent_rec));HFS_I (inode)->flags &= ~(HFS_FLG_EXT_DIRTY |HFS_FLG_EXT_NEW ); }else {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 157/237 hfsplus: fix return value of hfsplus_get_block()
In reply to Sasha LevinFrom: Ernesto A. Fernández <[email protected]>
[ Upstream commit 839c3a6a5e1fbc8542d581911b35b2cb5cd29304 ]
Direct writes to empty inodes fail with EIO. The generic direct-io code is in part to blame (a patch has been submitted as "direct-io: allow direct writes to empty inodes"), but hfsplus is worse affected than the other filesystems because the fallback to buffered I/O doesn't happen.
The problem is the return value of hfsplus_get_block() when called with !create. Change it to be more consistent with the other modules.
--- fs/hfsplus/extents.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/hfsplus/extents.c +3 -1
@@ -237,7 +237,9 @@ int hfsplus_get_block(struct inode *inode, sector_t iblock, ablock = iblock >> sbi->fs_shift;if (iblock >= hip->fs_blocks) { -if (iblock > hip->fs_blocks || !create) +if (!create) +return 0 ; +if (iblock > hip->fs_blocks)return -EIO ;if (ablock >= hip->alloc_blocks) { res =hfsplus_file_extend (inode, false);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 158/237 hfs: fix return value of hfs_get_block()
In reply to Sasha LevinFrom: Ernesto A. Fernández <[email protected]>
[ Upstream commit 1267a07be5ebbff2d2739290f3d043ae137c15b4 ]
Direct writes to empty inodes fail with EIO. The generic direct-io code is in part to blame (a patch has been submitted as "direct-io: allow direct writes to empty inodes"), but hfs is worse affected than the other filesystems because the fallback to buffered I/O doesn't happen.
The problem is the return value of hfs_get_block() when called with !create. Change it to be more consistent with the other modules.
--- fs/hfs/extent.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/hfs/extent.c +3 -1
@@ -345,7 +345,9 @@ int hfs_get_block(struct inode *inode, sector_t block, ablock = (u32 )block /HFS_SB (sb)->fs_div;if (block >=HFS_I (inode)->fs_blocks) { -if (block >HFS_I (inode)->fs_blocks || !create) +if (!create) +return 0 ; +if (block >HFS_I (inode)->fs_blocks)return -EIO ;if (ablock >=HFS_I (inode)->alloc_blocks) { res =hfs_extend_file (inode);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 159/237 hfsplus: update timestamps on truncate()
In reply to Sasha LevinFrom: Ernesto A. Fernández <[email protected]>
[ Upstream commit dc8844aada735890a6de109bef327f5df36a982e ]
The vfs takes care of updating ctime and mtime on ftruncate(), but on truncate() it must be done by the module.
This patch can be tested with xfstests generic/313.
--- fs/hfsplus/inode.c | 1 + 1 file changed, 1 insertion(+)
fs/hfsplus/inode.c +1 -0
@@ -261,6 +261,7 @@ static int hfsplus_setattr(struct dentry *dentry, struct iattr *attr) }truncate_setsize (inode, attr->ia_size);hfsplus_file_truncate (inode); + inode->i_mtime = inode->i_ctime =current_time (inode); }setattr_copy (inode, attr);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 160/237 hfs: update timestamp on truncate()
In reply to Sasha LevinFrom: Ernesto A. Fernández <[email protected]>
[ Upstream commit 8cd3cb5061730af085a3f9890a3352f162b4e20c ]
The vfs takes care of updating mtime on ftruncate(), but on truncate() it must be done by the module.
--- fs/hfs/inode.c | 2 ++ 1 file changed, 2 insertions(+)
fs/hfs/inode.c +2 -0
@@ -642,6 +642,8 @@ int hfs_inode_setattr(struct dentry *dentry, struct iattr * attr)truncate_setsize (inode, attr->ia_size);hfs_file_truncate (inode); + inode->i_atime = inode->i_mtime = inode->i_ctime = +current_time (inode); }setattr_copy (inode, attr);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 161/237 fs/hfs/extent.c: fix array out of bounds read of array extent
In reply to Sasha LevinFrom: Colin Ian King <[email protected]>
[ Upstream commit 6c9a3f843a29d6894dfc40df338b91dbd78f0ae3 ]
Currently extent and index i are both being incremented causing an array out of bounds read on extent[i]. Fix this by removing the extraneous increment of extent.
Ernesto said:
: This is only triggered when deleting a file with a resource fork. I : may be wrong because the documentation isn't clear, but I don't think : you can create those under linux. So I guess nobody was testing them. :
: > A disk space leak, perhaps?
:
: That's what it looks like in general. hfs_free_extents() won't do : anything if the block count doesn't add up, and the error will be : ignored. Now, if the block count randomly does add up, we could see : some corruption.
Detected by CoverityScan, CID#711541 ("Out of bounds read")
--- fs/hfs/extent.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/hfs/extent.c +1 -1
@@ -304,7 +304,7 @@ int hfs_free_fork(struct super_block *sb, struct hfs_cat_file *file, int type)return 0 ; blocks =0 ; -for (i =0 ; i <3 ; extent++, i++) +for (i =0 ; i <3 ; i++) blocks +=be16_to_cpu (extent[i].count); res =hfs_free_extents (sb, extent, blocks, blocks);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 162/237 kernel/panic.c: do not append newline to the stack protector panic string
In reply to Sasha LevinFrom: Borislav Petkov <[email protected]>
[ Upstream commit 95c4fb78fb23081472465ca20d5d31c4b780ed82 ]
... because panic() itself already does this. Otherwise you have line-broken trailer:
[ 1.836965] ---[ end Kernel panic - not syncing: stack-protector: Kernel stack is corrupted in: pgd_alloc+0x29e/0x2a0 [ 1.836965] ]---
--- kernel/panic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/panic.c +1 -1
@@ -636,7 +636,7 @@ device_initcall(register_warn_debugfs);*/ __visible void __stack_chk_fail(void) { -panic ("stack-protector: Kernel stack is corrupted in: %pB\n" , +panic ("stack-protector: Kernel stack is corrupted in: %pB" ,__builtin_return_address (0 )); }EXPORT_SYMBOL (__stack_chk_fail);
Signature · 1 line
2.20.1