[ 0/4] 3.0.51-stable review

[ 0/4] 3.0.51-stable review

[Greg Kroah-Hartman]

This is the start of the stable review cycle for the 3.0.51 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 Sun Nov  4 17:03:28 UTC 2012.
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/v3.0/stable-review/patch-3.0.51-rc1.gz
and the diffstat can be found below.

thanks,

greg k-h

-------------
Pseudo-Shortlog of commits:

Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Linux 3.0.51-rc1

Ben Skeggs <bskeggs@redhat.com>
    drm/nouveau: silence modesetting spam on pre-gf8 chipsets

Jan Kara <jack@suse.cz>
    mm: fix XFS oops due to dirty pages without buffers on s390

Len Brown <len.brown@intel.com>
    x86: Remove the ancient and deprecated disable_hlt() and enable_hlt() facility

Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
    floppy: do put_disk on current dr if blk_init_queue fails


-------------

Diffstat:

 Documentation/feature-removal-schedule.txt |  8 -------
 Makefile                                   |  4 ++--
 arch/x86/include/asm/system.h              |  7 ------
 arch/x86/kernel/process.c                  | 24 -------------------
 drivers/block/floppy.c                     | 37 +-----------------------------
 drivers/gpu/drm/nouveau/nv04_dac.c         |  8 +++----
 drivers/gpu/drm/nouveau/nv04_dfp.c         |  6 ++---
 drivers/gpu/drm/nouveau/nv04_tv.c          |  4 ++--
 mm/rmap.c                                  | 21 +++++++++++++----
 9 files changed, 28 insertions(+), 91 deletions(-)

[ 1/4] floppy: do put_disk on current dr if blk_init_queue fails

[Greg Kroah-Hartman]

3.0-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>

commit 238ab78469c6ab7845b43d5061cd3c92331b2452 upstream.

If blk_init_queue fails, we do not call put_disk on the current dr
(dr is decremented first in the error handling loop).

Reviewed-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 drivers/block/floppy.c |    1 +
 1 file changed, 1 insertion(+)

--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -4198,6 +4198,7 @@ static int __init floppy_init(void)
 
 		disks[dr]->queue = blk_init_queue(do_fd_request, &floppy_lock);
 		if (!disks[dr]->queue) {
+			put_disk(disks[dr]);
 			err = -ENOMEM;
 			goto out_put_disk;
 		}

[ 3/4] mm: fix XFS oops due to dirty pages without buffers on s390

[Greg Kroah-Hartman]

3.0-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Jan Kara <jack@suse.cz>

commit ef5d437f71afdf4afdbab99213add99f4b1318fd upstream.

On s390 any write to a page (even from kernel itself) sets architecture
specific page dirty bit.  Thus when a page is written to via buffered
write, HW dirty bit gets set and when we later map and unmap the page,
page_remove_rmap() finds the dirty bit and calls set_page_dirty().

Dirtying of a page which shouldn't be dirty can cause all sorts of
problems to filesystems.  The bug we observed in practice is that
buffers from the page get freed, so when the page gets later marked as
dirty and writeback writes it, XFS crashes due to an assertion
BUG_ON(!PagePrivate(page)) in page_buffers() called from
xfs_count_page_state().

Similar problem can also happen when zero_user_segment() call from
xfs_vm_writepage() (or block_write_full_page() for that matter) set the
hardware dirty bit during writeback, later buffers get freed, and then
page unmapped.

Fix the issue by ignoring s390 HW dirty bit for page cache pages of
mappings with mapping_cap_account_dirty().  This is safe because for
such mappings when a page gets marked as writeable in PTE it is also
marked dirty in do_wp_page() or do_page_fault().  When the dirty bit is
cleared by clear_page_dirty_for_io(), the page gets writeprotected in
page_mkclean().  So pagecache page is writeable if and only if it is
dirty.

Thanks to Hugh Dickins for pointing out mapping has to have
mapping_cap_account_dirty() for things to work and proposing a cleaned
up variant of the patch.

The patch has survived about two hours of running fsx-linux on tmpfs
while heavily swapping and several days of running on out build machines
where the original problem was triggered.

Signed-off-by: Jan Kara <jack@suse.cz>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Hugh Dickins <hughd@google.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>


---
 mm/rmap.c |   21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -57,6 +57,7 @@
 #include <linux/mmu_notifier.h>
 #include <linux/migrate.h>
 #include <linux/hugetlb.h>
+#include <linux/backing-dev.h>
 
 #include <asm/tlbflush.h>
 
@@ -936,11 +937,8 @@ int page_mkclean(struct page *page)
 
 	if (page_mapped(page)) {
 		struct address_space *mapping = page_mapping(page);
-		if (mapping) {
+		if (mapping)
 			ret = page_mkclean_file(mapping, page);
-			if (page_test_and_clear_dirty(page_to_pfn(page), 1))
-				ret = 1;
-		}
 	}
 
 	return ret;
@@ -1121,6 +1119,8 @@ void page_add_file_rmap(struct page *pag
  */
 void page_remove_rmap(struct page *page)
 {
+	struct address_space *mapping = page_mapping(page);
+
 	/* page still mapped by someone else? */
 	if (!atomic_add_negative(-1, &page->_mapcount))
 		return;
@@ -1131,8 +1131,19 @@ void page_remove_rmap(struct page *page)
 	 * this if the page is anon, so about to be freed; but perhaps
 	 * not if it's in swapcache - there might be another pte slot
 	 * containing the swap entry, but page not yet written to swap.
+	 *
+	 * And we can skip it on file pages, so long as the filesystem
+	 * participates in dirty tracking; but need to catch shm and tmpfs
+	 * and ramfs pages which have been modified since creation by read
+	 * fault.
+	 *
+	 * Note that mapping must be decided above, before decrementing
+	 * mapcount (which luckily provides a barrier): once page is unmapped,
+	 * it could be truncated and page->mapping reset to NULL at any moment.
+	 * Note also that we are relying on page_mapping(page) to set mapping
+	 * to &swapper_space when PageSwapCache(page).
 	 */
-	if ((!PageAnon(page) || PageSwapCache(page)) &&
+	if (mapping && !mapping_cap_account_dirty(mapping) &&
 	    page_test_and_clear_dirty(page_to_pfn(page), 1))
 		set_page_dirty(page);
 	/*

[ 4/4] drm/nouveau: silence modesetting spam on pre-gf8 chipsets

[Greg Kroah-Hartman]

3.0-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Ben Skeggs <bskeggs@redhat.com>

commit cee59f15a60cc6269a25e3f6fbf1a577d6ab8115 upstream.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 drivers/gpu/drm/nouveau/nv04_dac.c |    8 ++++----
 drivers/gpu/drm/nouveau/nv04_dfp.c |    6 +++---
 drivers/gpu/drm/nouveau/nv04_tv.c  |    4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

--- a/drivers/gpu/drm/nouveau/nv04_dac.c
+++ b/drivers/gpu/drm/nouveau/nv04_dac.c
@@ -209,7 +209,7 @@ out:
 	NVWriteVgaCrtc(dev, 0, NV_CIO_CR_MODE_INDEX, saved_cr_mode);
 
 	if (blue == 0x18) {
-		NV_INFO(dev, "Load detected on head A\n");
+		NV_DEBUG(dev, "Load detected on head A\n");
 		return connector_status_connected;
 	}
 
@@ -323,7 +323,7 @@ nv17_dac_detect(struct drm_encoder *enco
 
 	if (nv17_dac_sample_load(encoder) &
 	    NV_PRAMDAC_TEST_CONTROL_SENSEB_ALLHI) {
-		NV_INFO(dev, "Load detected on output %c\n",
+		NV_DEBUG(dev, "Load detected on output %c\n",
 			'@' + ffs(dcb->or));
 		return connector_status_connected;
 	} else {
@@ -398,7 +398,7 @@ static void nv04_dac_commit(struct drm_e
 
 	helper->dpms(encoder, DRM_MODE_DPMS_ON);
 
-	NV_INFO(dev, "Output %s is running on CRTC %d using output %c\n",
+	NV_DEBUG(dev, "Output %s is running on CRTC %d using output %c\n",
 		drm_get_connector_name(&nouveau_encoder_connector_get(nv_encoder)->base),
 		nv_crtc->index, '@' + ffs(nv_encoder->dcb->or));
 }
@@ -447,7 +447,7 @@ static void nv04_dac_dpms(struct drm_enc
 		return;
 	nv_encoder->last_dpms = mode;
 
-	NV_INFO(dev, "Setting dpms mode %d on vga encoder (output %d)\n",
+	NV_DEBUG(dev, "Setting dpms mode %d on vga encoder (output %d)\n",
 		     mode, nv_encoder->dcb->index);
 
 	nv04_dac_update_dacclk(encoder, mode == DRM_MODE_DPMS_ON);
--- a/drivers/gpu/drm/nouveau/nv04_dfp.c
+++ b/drivers/gpu/drm/nouveau/nv04_dfp.c
@@ -468,7 +468,7 @@ static void nv04_dfp_commit(struct drm_e
 
 	helper->dpms(encoder, DRM_MODE_DPMS_ON);
 
-	NV_INFO(dev, "Output %s is running on CRTC %d using output %c\n",
+	NV_DEBUG(dev, "Output %s is running on CRTC %d using output %c\n",
 		drm_get_connector_name(&nouveau_encoder_connector_get(nv_encoder)->base),
 		nv_crtc->index, '@' + ffs(nv_encoder->dcb->or));
 }
@@ -511,7 +511,7 @@ static void nv04_lvds_dpms(struct drm_en
 		return;
 	nv_encoder->last_dpms = mode;
 
-	NV_INFO(dev, "Setting dpms mode %d on lvds encoder (output %d)\n",
+	NV_DEBUG(dev, "Setting dpms mode %d on lvds encoder (output %d)\n",
 		     mode, nv_encoder->dcb->index);
 
 	if (was_powersaving && is_powersaving_dpms(mode))
@@ -556,7 +556,7 @@ static void nv04_tmds_dpms(struct drm_en
 		return;
 	nv_encoder->last_dpms = mode;
 
-	NV_INFO(dev, "Setting dpms mode %d on tmds encoder (output %d)\n",
+	NV_DEBUG(dev, "Setting dpms mode %d on tmds encoder (output %d)\n",
 		     mode, nv_encoder->dcb->index);
 
 	nv04_dfp_update_backlight(encoder, mode);
--- a/drivers/gpu/drm/nouveau/nv04_tv.c
+++ b/drivers/gpu/drm/nouveau/nv04_tv.c
@@ -69,7 +69,7 @@ static void nv04_tv_dpms(struct drm_enco
 	struct nv04_mode_state *state = &dev_priv->mode_reg;
 	uint8_t crtc1A;
 
-	NV_INFO(dev, "Setting dpms mode %d on TV encoder (output %d)\n",
+	NV_DEBUG(dev, "Setting dpms mode %d on TV encoder (output %d)\n",
 		mode, nv_encoder->dcb->index);
 
 	state->pllsel &= ~(PLLSEL_TV_CRTC1_MASK | PLLSEL_TV_CRTC2_MASK);
@@ -162,7 +162,7 @@ static void nv04_tv_commit(struct drm_en
 
 	helper->dpms(encoder, DRM_MODE_DPMS_ON);
 
-	NV_INFO(dev, "Output %s is running on CRTC %d using output %c\n",
+	NV_DEBUG(dev, "Output %s is running on CRTC %d using output %c\n",
 		      drm_get_connector_name(&nouveau_encoder_connector_get(nv_encoder)->base), nv_crtc->index,
 		      '@' + ffs(nv_encoder->dcb->or));
 }

Re: [ 0/4] 3.0.51-stable review

[Rafael Aquini]

On Fri, Nov 02, 2012 at 10:06:04AM -0700, Greg Kroah-Hartman wrote:
> This is the start of the stable review cycle for the 3.0.51 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 Sun Nov  4 17:03:28 UTC 2012.
> 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/v3.0/stable-review/patch-3.0.51-rc1.gz
> and the diffstat can be found below.
> 
> thanks,
> 
> greg k-h
> 
> -------------
> Pseudo-Shortlog of commits:
> 
> Greg Kroah-Hartman <gregkh@linuxfoundation.org>
>     Linux 3.0.51-rc1
> 
> Ben Skeggs <bskeggs@redhat.com>
>     drm/nouveau: silence modesetting spam on pre-gf8 chipsets
> 
> Jan Kara <jack@suse.cz>
>     mm: fix XFS oops due to dirty pages without buffers on s390
> 

Howdy Greg,

Somehow the following patch is missing for this series submission:
> Len Brown <len.brown@intel.com>
>     x86: Remove the ancient and deprecated disable_hlt() and enable_hlt() facility

I glanced at the the downloadable consolidated patch and its hunks seem to be present,
though.

Cheers!
-- Rafael

> 
> Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
>     floppy: do put_disk on current dr if blk_init_queue fails
> 
> 
> -------------
> 
> Diffstat:
> 
>  Documentation/feature-removal-schedule.txt |  8 -------
>  Makefile                                   |  4 ++--
>  arch/x86/include/asm/system.h              |  7 ------
>  arch/x86/kernel/process.c                  | 24 -------------------
>  drivers/block/floppy.c                     | 37 +-----------------------------
>  drivers/gpu/drm/nouveau/nv04_dac.c         |  8 +++----
>  drivers/gpu/drm/nouveau/nv04_dfp.c         |  6 ++---
>  drivers/gpu/drm/nouveau/nv04_tv.c          |  4 ++--
>  mm/rmap.c                                  | 21 +++++++++++++----
>  9 files changed, 28 insertions(+), 91 deletions(-)
> 
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/

Re: [ 0/4] 3.0.51-stable review

[Greg Kroah-Hartman]

On Fri, Nov 02, 2012 at 10:31:10PM -0200, Rafael Aquini wrote:
> On Fri, Nov 02, 2012 at 10:06:04AM -0700, Greg Kroah-Hartman wrote:
> > This is the start of the stable review cycle for the 3.0.51 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 Sun Nov  4 17:03:28 UTC 2012.
> > 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/v3.0/stable-review/patch-3.0.51-rc1.gz
> > and the diffstat can be found below.
> > 
> > thanks,
> > 
> > greg k-h
> > 
> > -------------
> > Pseudo-Shortlog of commits:
> > 
> > Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> >     Linux 3.0.51-rc1
> > 
> > Ben Skeggs <bskeggs@redhat.com>
> >     drm/nouveau: silence modesetting spam on pre-gf8 chipsets
> > 
> > Jan Kara <jack@suse.cz>
> >     mm: fix XFS oops due to dirty pages without buffers on s390
> > 
> 
> Howdy Greg,
> 
> Somehow the following patch is missing for this series submission:
> > Len Brown <len.brown@intel.com>
> >     x86: Remove the ancient and deprecated disable_hlt() and enable_hlt() facility
> 
> I glanced at the the downloadable consolidated patch and its hunks seem to be present,
> though.

I do not understand.  Where do you not see it?  It's in the patch on
kernel.org, right?  Where is it missing?

confused,

greg k-h

Re: [ 0/4] 3.0.51-stable review

[Rafael Aquini]

On Fri, Nov 02, 2012 at 09:07:11PM -0700, Greg Kroah-Hartman wrote:
> > 
> > Howdy Greg,
> > 
> > Somehow the following patch is missing for this series submission:
> > > Len Brown <len.brown@intel.com>
> > >     x86: Remove the ancient and deprecated disable_hlt() and enable_hlt() facility
> > 
> > I glanced at the the downloadable consolidated patch and its hunks seem to be present,
> > though.
> 
> I do not understand.  Where do you not see it?  It's in the patch on
> kernel.org, right?  Where is it missing?
> 

The LKML patch series is missing PATCH 02/04.



> confused,
> 
> greg k-h
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/

Re: [ 0/4] 3.0.51-stable review

[Greg Kroah-Hartman]

On Sat, Nov 03, 2012 at 09:45:02AM -0200, Rafael Aquini wrote:
> On Fri, Nov 02, 2012 at 09:07:11PM -0700, Greg Kroah-Hartman wrote:
> > > 
> > > Howdy Greg,
> > > 
> > > Somehow the following patch is missing for this series submission:
> > > > Len Brown <len.brown@intel.com>
> > > >     x86: Remove the ancient and deprecated disable_hlt() and enable_hlt() facility
> > > 
> > > I glanced at the the downloadable consolidated patch and its hunks seem to be present,
> > > though.
> > 
> > I do not understand.  Where do you not see it?  It's in the patch on
> > kernel.org, right?  Where is it missing?
> > 
> 
> The LKML patch series is missing PATCH 02/04.

Odd, I received a copy, but I don't know if it came from lkml or as a
copy sent to me directly.  I'll bounce it to you if you are curious
about it.

greg k-h

Re: [ 0/4] 3.0.51-stable review

[Steven Rostedt]

On Sat, 2012-11-03 at 07:43 -0700, Greg Kroah-Hartman wrote:
> On Sat, Nov 03, 2012 at 09:45:02AM -0200, Rafael Aquini wrote:
> > On Fri, Nov 02, 2012 at 09:07:11PM -0700, Greg Kroah-Hartman wrote:
> > > > 
> > > > Howdy Greg,
> > > > 
> > > > Somehow the following patch is missing for this series submission:
> > > > > Len Brown <len.brown@intel.com>
> > > > >     x86: Remove the ancient and deprecated disable_hlt() and enable_hlt() facility
> > > > 
> > > > I glanced at the the downloadable consolidated patch and its hunks seem to be present,
> > > > though.
> > > 
> > > I do not understand.  Where do you not see it?  It's in the patch on
> > > kernel.org, right?  Where is it missing?
> > > 
> > 
> > The LKML patch series is missing PATCH 02/04.
> 
> Odd, I received a copy, but I don't know if it came from lkml or as a
> copy sent to me directly.  I'll bounce it to you if you are curious
> about it.
> 

Yeah, 2/4 is missing. Probably had too many Cc's. I really wish David
Miller would remove that limit. I bet it's kept more legitimate emails
from making LKML than it has spam.

I know I've been burnt by it a few times :-/

-- Steve