* [PATCH 4.8 1/4] [media] v4l: rcar-fcp: Dont force users to check for disabled FCP support
2016-10-19 18:31 ` [PATCH 4.8 0/4] 4.8.3-stable review Greg Kroah-Hartman
@ 2016-10-19 18:31 ` Greg Kroah-Hartman
2016-10-19 18:31 ` [PATCH 4.8 2/4] scsi: configure runtime pm before calling device_add in scsi_add_host_with_dma Greg Kroah-Hartman
` (4 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Greg Kroah-Hartman @ 2016-10-19 18:31 UTC (permalink / raw)
To: linux-kernel
Cc: Greg Kroah-Hartman, stable, Sergei Shtylyov, Laurent Pinchart,
Geert Uytterhoeven, Mauro Carvalho Chehab
4.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
commit fd44aa9a254b18176ec3792a18e7de6977030ca8 upstream.
The rcar_fcp_enable() function immediately returns successfully when the
FCP device pointer is NULL to avoid forcing the users to check the FCP
device manually before every call. However, the stub version of the
function used when the FCP driver is disabled returns -ENOSYS
unconditionally, resulting in a different API contract for the two
versions of the function.
As a user that requires FCP support will fail at probe time when calling
rcar_fcp_get() if the FCP driver is disabled, the stub version of the
rcar_fcp_enable() function will only be called with a NULL FCP device.
We can thus return 0 unconditionally to align the behaviour with the
normal version of the function.
Reported-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
include/media/rcar-fcp.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/include/media/rcar-fcp.h
+++ b/include/media/rcar-fcp.h
@@ -29,7 +29,7 @@ static inline struct rcar_fcp_device *rc
static inline void rcar_fcp_put(struct rcar_fcp_device *fcp) { }
static inline int rcar_fcp_enable(struct rcar_fcp_device *fcp)
{
- return -ENOSYS;
+ return 0;
}
static inline void rcar_fcp_disable(struct rcar_fcp_device *fcp) { }
#endif
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH 4.8 2/4] scsi: configure runtime pm before calling device_add in scsi_add_host_with_dma
2016-10-19 18:31 ` [PATCH 4.8 0/4] 4.8.3-stable review Greg Kroah-Hartman
2016-10-19 18:31 ` [PATCH 4.8 1/4] [media] v4l: rcar-fcp: Dont force users to check for disabled FCP support Greg Kroah-Hartman
@ 2016-10-19 18:31 ` Greg Kroah-Hartman
2016-10-19 18:31 ` [PATCH 4.8 3/4] Make __xfs_xattr_put_listen preperly report errors Greg Kroah-Hartman
` (3 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Greg Kroah-Hartman @ 2016-10-19 18:31 UTC (permalink / raw)
To: linux-kernel
Cc: Greg Kroah-Hartman, stable, Heiner Kallweit, Alan Stern,
Martin K. Petersen
4.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Heiner Kallweit <hkallweit1@gmail.com>
commit 0d5644b7d8daa3c1d91acb4367731f568c9c9469 upstream.
Runtime PM should be configured already once we call device_add. See
also the description in this mail thread
https://lists.linuxfoundation.org/pipermail/linux-pm/2009-November/023198.html
or the order of calls e.g. in usb_new_device.
The changed order also helps to avoid scenarios where runtime pm for
&shost->shost_gendev is activated whilst the parent is suspended,
resulting in error message "runtime PM trying to activate child device
hostx but parent yyy is not active".
In addition properly reverse the runtime pm calls in the error path.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/scsi/hosts.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
--- a/drivers/scsi/hosts.c
+++ b/drivers/scsi/hosts.c
@@ -246,10 +246,6 @@ int scsi_add_host_with_dma(struct Scsi_H
shost->dma_dev = dma_dev;
- error = device_add(&shost->shost_gendev);
- if (error)
- goto out_destroy_freelist;
-
/*
* Increase usage count temporarily here so that calling
* scsi_autopm_put_host() will trigger runtime idle if there is
@@ -260,6 +256,10 @@ int scsi_add_host_with_dma(struct Scsi_H
pm_runtime_enable(&shost->shost_gendev);
device_enable_async_suspend(&shost->shost_gendev);
+ error = device_add(&shost->shost_gendev);
+ if (error)
+ goto out_destroy_freelist;
+
scsi_host_set_state(shost, SHOST_RUNNING);
get_device(shost->shost_gendev.parent);
@@ -309,6 +309,10 @@ int scsi_add_host_with_dma(struct Scsi_H
out_del_gendev:
device_del(&shost->shost_gendev);
out_destroy_freelist:
+ device_disable_async_suspend(&shost->shost_gendev);
+ pm_runtime_disable(&shost->shost_gendev);
+ pm_runtime_set_suspended(&shost->shost_gendev);
+ pm_runtime_put_noidle(&shost->shost_gendev);
scsi_destroy_command_freelist(shost);
out_destroy_tags:
if (shost_use_blk_mq(shost))
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH 4.8 3/4] Make __xfs_xattr_put_listen preperly report errors.
2016-10-19 18:31 ` [PATCH 4.8 0/4] 4.8.3-stable review Greg Kroah-Hartman
2016-10-19 18:31 ` [PATCH 4.8 1/4] [media] v4l: rcar-fcp: Dont force users to check for disabled FCP support Greg Kroah-Hartman
2016-10-19 18:31 ` [PATCH 4.8 2/4] scsi: configure runtime pm before calling device_add in scsi_add_host_with_dma Greg Kroah-Hartman
@ 2016-10-19 18:31 ` Greg Kroah-Hartman
2016-10-19 18:31 ` [PATCH 4.8 4/4] mm: remove gup_flags FOLL_WRITE games from __get_user_pages() Greg Kroah-Hartman
` (2 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Greg Kroah-Hartman @ 2016-10-19 18:31 UTC (permalink / raw)
To: linux-kernel
Cc: Greg Kroah-Hartman, stable, Artem Savkov, Dave Chinner,
Dave Chinner, Eric Sandeen
4.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Artem Savkov <asavkov@redhat.com>
commit 791cc43b36eb1f88166c8505900cad1b43c7fe1a upstream.
Commit 2a6fba6 "xfs: only return -errno or success from attr ->put_listent"
changes the returnvalue of __xfs_xattr_put_listen to 0 in case when there is
insufficient space in the buffer assuming that setting context->count to -1
would be enough, but all of the ->put_listent callers only check seen_enough.
This results in a failed assertion:
XFS: Assertion failed: context->count >= 0, file: fs/xfs/xfs_xattr.c, line: 175
in insufficient buffer size case.
This is only reproducible with at least 2 xattrs and only when the buffer
gets depleted before the last one.
Furthermore if buffersize is such that it is enough to hold the last xattr's
name, but not enough to hold the sum of preceeding xattr names listxattr won't
fail with ERANGE, but will suceed returning last xattr's name without the
first character. The first character end's up overwriting data stored at
(context->alist - 1).
Signed-off-by: Artem Savkov <asavkov@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
Cc: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
fs/xfs/xfs_xattr.c | 1 +
1 file changed, 1 insertion(+)
--- a/fs/xfs/xfs_xattr.c
+++ b/fs/xfs/xfs_xattr.c
@@ -147,6 +147,7 @@ __xfs_xattr_put_listent(
arraytop = context->count + prefix_len + namelen + 1;
if (arraytop > context->firstu) {
context->count = -1; /* insufficient space */
+ context->seen_enough = 1;
return 0;
}
offset = (char *)context->alist + context->count;
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH 4.8 4/4] mm: remove gup_flags FOLL_WRITE games from __get_user_pages()
2016-10-19 18:31 ` [PATCH 4.8 0/4] 4.8.3-stable review Greg Kroah-Hartman
` (2 preceding siblings ...)
2016-10-19 18:31 ` [PATCH 4.8 3/4] Make __xfs_xattr_put_listen preperly report errors Greg Kroah-Hartman
@ 2016-10-19 18:31 ` Greg Kroah-Hartman
2016-10-19 22:30 ` [PATCH 4.8 0/4] 4.8.3-stable review Shuah Khan
2016-10-20 1:44 ` Guenter Roeck
5 siblings, 0 replies; 9+ messages in thread
From: Greg Kroah-Hartman @ 2016-10-19 18:31 UTC (permalink / raw)
To: linux-kernel
Cc: Greg Kroah-Hartman, stable, Hugh Dickins, Michal Hocko,
Andy Lutomirski, Kees Cook, Oleg Nesterov, Willy Tarreau,
Nick Piggin, Greg Thelen, Linus Torvalds
4.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Linus Torvalds <torvalds@linux-foundation.org>
commit 19be0eaffa3ac7d8eb6784ad9bdbc7d67ed8e619 upstream.
This is an ancient bug that was actually attempted to be fixed once
(badly) by me eleven years ago in commit 4ceb5db9757a ("Fix
get_user_pages() race for write access") but that was then undone due to
problems on s390 by commit f33ea7f404e5 ("fix get_user_pages bug").
In the meantime, the s390 situation has long been fixed, and we can now
fix it by checking the pte_dirty() bit properly (and do it better). The
s390 dirty bit was implemented in abf09bed3cce ("s390/mm: implement
software dirty bits") which made it into v3.9. Earlier kernels will
have to look at the page state itself.
Also, the VM has become more scalable, and what used a purely
theoretical race back then has become easier to trigger.
To fix it, we introduce a new internal FOLL_COW flag to mark the "yes,
we already did a COW" rather than play racy games with FOLL_WRITE that
is very fundamental, and then use the pte dirty flag to validate that
the FOLL_COW flag is still valid.
Reported-and-tested-by: Phil "not Paul" Oester <kernel@linuxace.com>
Acked-by: Hugh Dickins <hughd@google.com>
Reviewed-by: Michal Hocko <mhocko@suse.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Kees Cook <keescook@chromium.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Willy Tarreau <w@1wt.eu>
Cc: Nick Piggin <npiggin@gmail.com>
Cc: Greg Thelen <gthelen@google.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
include/linux/mm.h | 1 +
mm/gup.c | 14 ++++++++++++--
2 files changed, 13 insertions(+), 2 deletions(-)
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -2234,6 +2234,7 @@ static inline struct page *follow_page(s
#define FOLL_TRIED 0x800 /* a retry, previous pass started an IO */
#define FOLL_MLOCK 0x1000 /* lock present pages */
#define FOLL_REMOTE 0x2000 /* we are working on non-current tsk/mm */
+#define FOLL_COW 0x4000 /* internal GUP flag */
typedef int (*pte_fn_t)(pte_t *pte, pgtable_t token, unsigned long addr,
void *data);
--- a/mm/gup.c
+++ b/mm/gup.c
@@ -60,6 +60,16 @@ static int follow_pfn_pte(struct vm_area
return -EEXIST;
}
+/*
+ * FOLL_FORCE can write to even unwritable pte's, but only
+ * after we've gone through a COW cycle and they are dirty.
+ */
+static inline bool can_follow_write_pte(pte_t pte, unsigned int flags)
+{
+ return pte_write(pte) ||
+ ((flags & FOLL_FORCE) && (flags & FOLL_COW) && pte_dirty(pte));
+}
+
static struct page *follow_page_pte(struct vm_area_struct *vma,
unsigned long address, pmd_t *pmd, unsigned int flags)
{
@@ -95,7 +105,7 @@ retry:
}
if ((flags & FOLL_NUMA) && pte_protnone(pte))
goto no_page;
- if ((flags & FOLL_WRITE) && !pte_write(pte)) {
+ if ((flags & FOLL_WRITE) && !can_follow_write_pte(pte, flags)) {
pte_unmap_unlock(ptep, ptl);
return NULL;
}
@@ -412,7 +422,7 @@ static int faultin_page(struct task_stru
* reCOWed by userspace write).
*/
if ((ret & VM_FAULT_WRITE) && !(vma->vm_flags & VM_WRITE))
- *flags &= ~FOLL_WRITE;
+ *flags |= FOLL_COW;
return 0;
}
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH 4.8 0/4] 4.8.3-stable review
2016-10-19 18:31 ` [PATCH 4.8 0/4] 4.8.3-stable review Greg Kroah-Hartman
` (3 preceding siblings ...)
2016-10-19 18:31 ` [PATCH 4.8 4/4] mm: remove gup_flags FOLL_WRITE games from __get_user_pages() Greg Kroah-Hartman
@ 2016-10-19 22:30 ` Shuah Khan
2016-10-20 8:14 ` Greg Kroah-Hartman
2016-10-20 1:44 ` Guenter Roeck
5 siblings, 1 reply; 9+ messages in thread
From: Shuah Khan @ 2016-10-19 22:30 UTC (permalink / raw)
To: Greg Kroah-Hartman, linux-kernel
Cc: torvalds, akpm, linux, patches, ben.hutchings, stable, Shuah Khan
On 10/19/2016 12:31 PM, Greg Kroah-Hartman wrote:
> This is the start of the stable review cycle for the 4.8.3 release.
> There are 4 patches in this series, all will be posted as a response
> to this one. If anyone has any issues with these being applied, please
> let me know.
>
> Responses should be made by Fri Oct 21 18:29:21 UTC 2016.
> Anything received after that time might be too late.
>
> The whole patch series can be found in one patch at:
> kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.8.3-rc1.gz
> or in the git tree and branch at:
> git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.8.y
> and the diffstat can be found below.
>
> thanks,
>
> greg k-h
>
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah
--
Shuah Khan
Sr. Linux Kernel Developer
Open Source Innovation Group
Samsung Research America(Silicon Valley)
shuah.kh@samsung.com
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH 4.8 0/4] 4.8.3-stable review
2016-10-19 22:30 ` [PATCH 4.8 0/4] 4.8.3-stable review Shuah Khan
@ 2016-10-20 8:14 ` Greg Kroah-Hartman
0 siblings, 0 replies; 9+ messages in thread
From: Greg Kroah-Hartman @ 2016-10-20 8:14 UTC (permalink / raw)
To: Shuah Khan
Cc: linux-kernel, torvalds, akpm, linux, patches, ben.hutchings,
stable
On Wed, Oct 19, 2016 at 04:30:05PM -0600, Shuah Khan wrote:
> On 10/19/2016 12:31 PM, Greg Kroah-Hartman wrote:
> > This is the start of the stable review cycle for the 4.8.3 release.
> > There are 4 patches in this series, all will be posted as a response
> > to this one. If anyone has any issues with these being applied, please
> > let me know.
> >
> > Responses should be made by Fri Oct 21 18:29:21 UTC 2016.
> > Anything received after that time might be too late.
> >
> > The whole patch series can be found in one patch at:
> > kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.8.3-rc1.gz
> > or in the git tree and branch at:
> > git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.8.y
> > and the diffstat can be found below.
> >
> > thanks,
> >
> > greg k-h
> >
>
> Compiled and booted on my test system. No dmesg regressions.
Thanks for testing all of these and letting me know.
greg k-h
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 4.8 0/4] 4.8.3-stable review
2016-10-19 18:31 ` [PATCH 4.8 0/4] 4.8.3-stable review Greg Kroah-Hartman
` (4 preceding siblings ...)
2016-10-19 22:30 ` [PATCH 4.8 0/4] 4.8.3-stable review Shuah Khan
@ 2016-10-20 1:44 ` Guenter Roeck
2016-10-20 8:15 ` Greg Kroah-Hartman
5 siblings, 1 reply; 9+ messages in thread
From: Guenter Roeck @ 2016-10-20 1:44 UTC (permalink / raw)
To: Greg Kroah-Hartman, linux-kernel
Cc: torvalds, akpm, shuah.kh, patches, ben.hutchings, stable
On 10/19/2016 11:31 AM, Greg Kroah-Hartman wrote:
> This is the start of the stable review cycle for the 4.8.3 release.
> There are 4 patches in this series, all will be posted as a response
> to this one. If anyone has any issues with these being applied, please
> let me know.
>
> Responses should be made by Fri Oct 21 18:29:21 UTC 2016.
> Anything received after that time might be too late.
>
Build results:
total: 149 pass: 149 fail: 0
Qemu test results:
total: 110 pass: 110 fail: 0
Details are available at http://kerneltests.org/builders.
Guenter
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH 4.8 0/4] 4.8.3-stable review
2016-10-20 1:44 ` Guenter Roeck
@ 2016-10-20 8:15 ` Greg Kroah-Hartman
0 siblings, 0 replies; 9+ messages in thread
From: Greg Kroah-Hartman @ 2016-10-20 8:15 UTC (permalink / raw)
To: Guenter Roeck
Cc: linux-kernel, torvalds, akpm, shuah.kh, patches, ben.hutchings,
stable
On Wed, Oct 19, 2016 at 06:44:01PM -0700, Guenter Roeck wrote:
> On 10/19/2016 11:31 AM, Greg Kroah-Hartman wrote:
> > This is the start of the stable review cycle for the 4.8.3 release.
> > There are 4 patches in this series, all will be posted as a response
> > to this one. If anyone has any issues with these being applied, please
> > let me know.
> >
> > Responses should be made by Fri Oct 21 18:29:21 UTC 2016.
> > Anything received after that time might be too late.
> >
>
> Build results:
> total: 149 pass: 149 fail: 0
> Qemu test results:
> total: 110 pass: 110 fail: 0
>
> Details are available at http://kerneltests.org/builders.
Wonderful, thanks for all of the testing and letting me know.
greg k-h
^ permalink raw reply [flat|nested] 9+ messages in thread