Skip to contentSkip to conversation

Linux 2.6.16.22

DISCUSSION Chris Wright 5 participants 8 messages Jun 22, 2006 – Jun 28, 2006

Subsystems (12)
Memory management VFS SCSI USB +8 more subsystems
lore
Share & tools
lore
#0 lore raw

We (the -stable team) are announcing the release of the 2.6.16.22 kernel. The diffstat and short summary of the fixes are below.

I'll also be replying to this message with a copy of the patch between 2.6.16.21 and 2.6.16.22, as it is small enough to do so.

The updated 2.6.16.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.16.y.git
and can be browsed at the normal kernel.org git web browser:
www.kernel.org/git/

thanks,
-chris

--------

 Makefile                            |    2 
 arch/sparc64/kernel/pci_iommu.c     |    4 -
 arch/sparc64/kernel/sparc64_ksyms.c |    2 
 arch/sparc64/lib/checksum.S         |    5 -
 arch/sparc64/lib/csum_copy.S        |    5 -
 drivers/acpi/processor_perflib.c    |    5 +
 drivers/message/i2o/exec-osm.c      |   72 +++++++++---------
 drivers/message/i2o/iop.c           |    4 -
 drivers/parport/Kconfig             |    2 
 drivers/scsi/scsi_lib.c             |    2 
 drivers/usb/serial/whiteheat.c      |    4 -
 fs/jfs/jfs_metapage.c               |   20 +----
 fs/namei.c                          |   25 ++++--
 fs/ntfs/file.c                      |   13 +--
 include/asm-generic/pgtable.h       |   11 --
 include/asm-mips/pgtable.h          |   10 ++
 include/asm-sparc64/dma-mapping.h   |  141 +++++++++++++++++++++++++++++++++++-
 include/asm-sparc64/pci.h           |    4 -
 include/asm-sparc64/pgtable.h       |   17 ++++
 include/linux/i2o.h                 |    5 +
 mm/shmem.c                          |    1 
 21 files changed, 259 insertions(+), 95 deletions(-)

Summary of changes from v2.6.16.21 to v2.6.16.22
================================================

Andrew Morton:
powernow-k8 crash workaround

Anton Altaparmakov:
NTFS: Critical bug fix (affects MIPS and possibly others)

Chris Wright:

      Linux 2.6.16.22

Dave Kleikamp:
JFS: Fix multiple errors in metapage_releasepage

David Miller:
SPARC64: Fix D-cache corruption in mremap
SPARC64: Respect gfp_t argument to dma_alloc_coherent().
SPARC64: Fix missing fold at end of checksums.

James Bottomley:
scsi_lib.c: properly count the number of pages in scsi_req_map_sg()

Markus Lidel:
I2O: Bugfixes to get I2O working again

Oleg Drokin:
Missed error checking for intent's filp in open_namei().

Robin H. Johnson:
tmpfs: time granularity fix for [acm]time going backwards

Stuart MacDonald:
USB: Whiteheat: fix firmware spurious errors

Trond Myklebust:
fs/namei.c: Call to file_permission() under a spinlock in do_lookup_path()

#1 lore raw
Makefile +1 -1
index 7ae2744..4b2bb08 100644
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 16
-EXTRAVERSION = .21
+EXTRAVERSION = .22
 NAME=Sliding Snow Leopard
 
 # *DOCUMENTATION*
arch/sparc64/kernel/pci_iommu.c +2 -2
index a11910b..f63f065 100644
@@ -219,7 +219,7 @@ static inline void iommu_free_ctx(struct
  * DMA for PCI device PDEV.  Return non-NULL cpu-side address if
  * successful and set *DMA_ADDRP to the PCI side dma address.
  */
-void *pci_alloc_consistent(struct pci_dev *pdev, size_t size, dma_addr_t *dma_addrp)
+void *__pci_alloc_consistent(struct pci_dev *pdev, size_t size, dma_addr_t *dma_addrp, gfp_t gfp)
 {
 	struct pcidev_cookie *pcp;
 	struct pci_iommu *iommu;
@@ -233,7 +233,7 @@ void *pci_alloc_consistent(struct pci_de
 	if (order >= 10)
 		return NULL;
 
-	first_page = __get_free_pages(GFP_ATOMIC, order);
+	first_page = __get_free_pages(gfp, order);
 	if (first_page == 0UL)
 		return NULL;
 	memset((char *)first_page, 0, PAGE_SIZE << order);
arch/sparc64/kernel/sparc64_ksyms.c +1 -1
index 3c06bfb..a6fe4f3 100644
@@ -221,7 +221,7 @@ #ifdef CONFIG_PCI
 EXPORT_SYMBOL(ebus_chain);
 EXPORT_SYMBOL(isa_chain);
 EXPORT_SYMBOL(pci_memspace_mask);
-EXPORT_SYMBOL(pci_alloc_consistent);
+EXPORT_SYMBOL(__pci_alloc_consistent);
 EXPORT_SYMBOL(pci_free_consistent);
 EXPORT_SYMBOL(pci_map_single);
 EXPORT_SYMBOL(pci_unmap_single);
arch/sparc64/lib/checksum.S +3 -2
index ba9cd3c..1d230f6 100644
@@ -165,8 +165,9 @@ csum_partial_end_cruft:
 	sll		%g1, 8, %g1
 	or		%o5, %g1, %o4
 
-1:	add		%o2, %o4, %o2
+1:	addcc		%o2, %o4, %o2
+	addc		%g0, %o2, %o2
 
 csum_partial_finish:
 	retl
-	 mov		%o2, %o0
+	 srl		%o2, 0, %o0
arch/sparc64/lib/csum_copy.S +3 -2
index 71af488..e566c77 100644
@@ -221,11 +221,12 @@ FUNC_NAME:		/* %o0=src, %o1=dst, %o2=len
 	sll		%g1, 8, %g1
 	or		%o5, %g1, %o4
 
-1:	add		%o3, %o4, %o3
+1:	addcc		%o3, %o4, %o3
+	addc		%g0, %o3, %o3
 
 70:
 	retl
-	 mov		%o3, %o0
+	 srl		%o3, 0, %o0
 
 95:	mov		0, GLOBAL_SPARE
 	brlez,pn	%o2, 4f
drivers/acpi/processor_perflib.c +4 -1
index abbdb37..f36db22 100644
@@ -577,6 +577,8 @@ acpi_processor_register_performance(stru
 		return_VALUE(-EBUSY);
 	}
 
+	WARN_ON(!performance);
+
 	pr->performance = performance;
 
 	if (acpi_processor_get_performance_info(pr)) {
@@ -609,7 +611,8 @@ acpi_processor_unregister_performance(st
 		return_VOID;
 	}
 
-	kfree(pr->performance->states);
+	if (pr->performance)
+		kfree(pr->performance->states);
 	pr->performance = NULL;
 
 	acpi_cpufreq_remove_file(pr);
drivers/message/i2o/exec-osm.c +37 -35

165 lines not on this page · raw message

drivers/message/i2o/iop.c +1 -3
index 4921674..febbdd4 100644
@@ -804,8 +804,6 @@ void i2o_iop_remove(struct i2o_controlle
 
 	/* Ask the IOP to switch to RESET state */
 	i2o_iop_reset(c);
-
-	put_device(&c->device);
 }
 
 /**
@@ -1059,7 +1057,7 @@ struct i2o_controller *i2o_iop_alloc(voi
 
 	snprintf(poolname, sizeof(poolname), "i2o_%s_msg_inpool", c->name);
 	if (i2o_pool_alloc
-	    (&c->in_msg, poolname, I2O_INBOUND_MSG_FRAME_SIZE * 4,
+	    (&c->in_msg, poolname, I2O_INBOUND_MSG_FRAME_SIZE * 4 + sizeof(u32),
 	     I2O_MSG_INPOOL_MIN)) {
 		kfree(c);
 		return ERR_PTR(-ENOMEM);
drivers/parport/Kconfig +1 -1
index f63c387..6c8452e 100644
@@ -48,7 +48,7 @@ config PARPORT_PC
 
 config PARPORT_SERIAL
 	tristate "Multi-IO cards (parallel and serial)"
-	depends on SERIAL_8250 && PARPORT_PC && PCI
+	depends on SERIAL_8250_PCI && PARPORT_PC && PCI
 	help
 	  This adds support for multi-IO PCI cards that have parallel and
 	  serial ports.  You should say Y or M here.  If you say M, the module
drivers/scsi/scsi_lib.c +1 -1
index 701a328..a0cd6de 100644
@@ -368,7 +368,7 @@ static int scsi_req_map_sg(struct reques
 			   int nsegs, unsigned bufflen, gfp_t gfp)
 {
 	struct request_queue *q = rq->q;
-	int nr_pages = (bufflen + PAGE_SIZE - 1) >> PAGE_SHIFT;
+	int nr_pages = (bufflen + sgl[0].offset + PAGE_SIZE - 1) >> PAGE_SHIFT;
 	unsigned int data_len = 0, len, bytes, off;
 	struct page *page;
 	struct bio *bio = NULL;
drivers/usb/serial/whiteheat.c +2 -2
index 557411c..f494b67 100644
@@ -388,7 +388,7 @@ static int whiteheat_attach (struct usb_
 	if (ret) {
 		err("%s: Couldn't send command [%d]", serial->type->description, ret);
 		goto no_firmware;
-	} else if (alen != sizeof(command)) {
+	} else if (alen != 2) {
 		err("%s: Send command incomplete [%d]", serial->type->description, alen);
 		goto no_firmware;
 	}
@@ -400,7 +400,7 @@ static int whiteheat_attach (struct usb_
 	if (ret) {
 		err("%s: Couldn't get results [%d]", serial->type->description, ret);
 		goto no_firmware;
-	} else if (alen != sizeof(result)) {
+	} else if (alen != sizeof(*hw_info) + 1) {
 		err("%s: Get results incomplete [%d]", serial->type->description, alen);
 		goto no_firmware;
 	} else if (result[0] != command[0]) {
fs/jfs/jfs_metapage.c +5 -15
index 8a53981..c82d076 100644
@@ -543,7 +543,7 @@ add_failed:
 static int metapage_releasepage(struct page *page, gfp_t gfp_mask)
 {
 	struct metapage *mp;
-	int busy = 0;
+	int ret = 1;
 	unsigned int offset;
 
 	for (offset = 0; offset < PAGE_CACHE_SIZE; offset += PSIZE) {
@@ -553,30 +553,20 @@ static int metapage_releasepage(struct p
 			continue;
 
 		jfs_info("metapage_releasepage: mp = 0x%p", mp);
-		if (mp->count || mp->nohomeok) {
+		if (mp->count || mp->nohomeok ||
+		    test_bit(META_dirty, &mp->flag)) {
 			jfs_info("count = %ld, nohomeok = %d", mp->count,
 				 mp->nohomeok);
-			busy = 1;
+			ret = 0;
 			continue;
 		}
-		wait_on_page_writeback(page);
-		//WARN_ON(test_bit(META_dirty, &mp->flag));
-		if (test_bit(META_dirty, &mp->flag)) {
-			dump_mem("dirty mp in metapage_releasepage", mp,
-				 sizeof(struct metapage));
-			dump_mem("page", page, sizeof(struct page));
-			dump_stack();
-		}
 		if (mp->lsn)
 			remove_from_logsync(mp);
 		remove_metapage(page, mp);
 		INCREMENT(mpStat.pagefree);
 		free_metapage(mp);
 	}
-	if (busy)
-		return -1;
-
-	return 0;
+	return ret;
 }
 
 static int metapage_invalidatepage(struct page *page, unsigned long offset)
fs/namei.c +16 -9
index 8dc2b03..f11c0aa 100644
@@ -1077,8 +1077,8 @@ static int fastcall do_path_lookup(int d
 	nd->flags = flags;
 	nd->depth = 0;
 
-	read_lock(&current->fs->lock);
 	if (*name=='/') {
+		read_lock(&current->fs->lock);
 		if (current->fs->altroot && !(nd->flags & LOOKUP_NOALT)) {
 			nd->mnt = mntget(current->fs->altrootmnt);
 			nd->dentry = dget(current->fs->altroot);
@@ -1089,33 +1089,35 @@ static int fastcall do_path_lookup(int d
 		}
 		nd->mnt = mntget(current->fs->rootmnt);
 		nd->dentry = dget(current->fs->root);
+		read_unlock(&current->fs->lock);
 	} else if (dfd == AT_FDCWD) {
+		read_lock(&current->fs->lock);
 		nd->mnt = mntget(current->fs->pwdmnt);
 		nd->dentry = dget(current->fs->pwd);
+		read_unlock(&current->fs->lock);
 	} else {
 		struct dentry *dentry;
 
 		file = fget_light(dfd, &fput_needed);
 		retval = -EBADF;
 		if (!file)
-			goto unlock_fail;
+			goto out_fail;
 
 		dentry = file->f_dentry;
 
 		retval = -ENOTDIR;
 		if (!S_ISDIR(dentry->d_inode->i_mode))
-			goto fput_unlock_fail;
+			goto fput_fail;
 
 		retval = file_permission(file, MAY_EXEC);
 		if (retval)
-			goto fput_unlock_fail;
+			goto fput_fail;
 
 		nd->mnt = mntget(file->f_vfsmnt);
 		nd->dentry = dget(dentry);
 
 		fput_light(file, fput_needed);
 	}
-	read_unlock(&current->fs->lock);
 	current->total_link_count = 0;
 	retval = link_path_walk(name, nd);
 out:
@@ -1124,13 +1126,12 @@ out:
 				nd->dentry->d_inode))
 		audit_inode(name, nd->dentry->d_inode, flags);
 	}
+out_fail:
 	return retval;
 
-fput_unlock_fail:
+fput_fail:
 	fput_light(file, fput_needed);
-unlock_fail:
-	read_unlock(&current->fs->lock);
-	return retval;
+	goto out_fail;
 }
 
 int fastcall path_lookup(const char *name, unsigned int flags,
@@ -1628,6 +1629,12 @@ do_last:
 		goto exit;
 	}
 
+	if (IS_ERR(nd->intent.open.file)) {
+		mutex_unlock(&dir->d_inode->i_mutex);
+		error = PTR_ERR(nd->intent.open.file);
+		goto exit_dput;
+	}
+
 	/* Negative dentry, just create the file */
 	if (!path.dentry->d_inode) {
 		if (!IS_POSIXACL(dir->d_inode))
fs/ntfs/file.c +7 -6
index 5027d3d..89449d3 100644
@@ -1489,14 +1489,15 @@ static inline void ntfs_flush_dcache_pag
 		unsigned nr_pages)
 {
 	BUG_ON(!nr_pages);
+	/*
+	 * Warning: Do not do the decrement at the same time as the call to
+	 * flush_dcache_page() because it is a NULL macro on i386 and hence the
+	 * decrement never happens so the loop never terminates.
+	 */
 	do {
-		/*
-		 * Warning: Do not do the decrement at the same time as the
-		 * call because flush_dcache_page() is a NULL macro on i386
-		 * and hence the decrement never happens.
-		 */
+		--nr_pages;
 		flush_dcache_page(pages[nr_pages]);
-	} while (--nr_pages > 0);
+	} while (nr_pages > 0);
 }
 
 /**
include/asm-generic/pgtable.h +1 -10
index 358e4d3..c2059a3 100644
@@ -159,17 +159,8 @@ #ifndef __HAVE_ARCH_LAZY_MMU_PROT_UPDATE
 #define lazy_mmu_prot_update(pte)	do { } while (0)
 #endif
 
-#ifndef __HAVE_ARCH_MULTIPLE_ZERO_PAGE
+#ifndef __HAVE_ARCH_MOVE_PTE
 #define move_pte(pte, prot, old_addr, new_addr)	(pte)
-#else
-#define move_pte(pte, prot, old_addr, new_addr)				\
-({									\
- 	pte_t newpte = (pte);						\
-	if (pte_present(pte) && pfn_valid(pte_pfn(pte)) &&		\
-			pte_page(pte) == ZERO_PAGE(old_addr))		\
-		newpte = mk_pte(ZERO_PAGE(new_addr), (prot));		\
-	newpte;								\
-})
 #endif
 
 /*
include/asm-mips/pgtable.h +9 -1
index 702a28f..69cebbd 100644
@@ -70,7 +70,15 @@ extern unsigned long zero_page_mask;
 #define ZERO_PAGE(vaddr) \
 	(virt_to_page(empty_zero_page + (((unsigned long)(vaddr)) & zero_page_mask)))
 
-#define __HAVE_ARCH_MULTIPLE_ZERO_PAGE
+#define __HAVE_ARCH_MOVE_PTE
+#define move_pte(pte, prot, old_addr, new_addr)				\
+({									\
+ 	pte_t newpte = (pte);						\
+	if (pte_present(pte) && pfn_valid(pte_pfn(pte)) &&		\
+			pte_page(pte) == ZERO_PAGE(old_addr))		\
+		newpte = mk_pte(ZERO_PAGE(new_addr), (prot));		\
+	newpte;								\
+})
 
 extern void paging_init(void);
 
include/asm-sparc64/dma-mapping.h +140 -1

147 lines not on this page · raw message

include/asm-sparc64/pci.h +3 -1
index 89bd71b..5b12c2a 100644
@@ -44,7 +44,9 @@ struct pci_dev;
 /* Allocate and map kernel buffer using consistent mode DMA for a device.
  * hwdev should be valid struct pci_dev pointer for PCI devices.
  */
-extern void *pci_alloc_consistent(struct pci_dev *hwdev, size_t size, dma_addr_t *dma_handle);
+extern void *__pci_alloc_consistent(struct pci_dev *hwdev, size_t size, dma_addr_t *dma_handle, gfp_t gfp);
+#define pci_alloc_consistent(DEV,SZ,HANDLE) \
+	__pci_alloc_consistent(DEV,SZ,HANDLE,GFP_ATOMIC)
 
 /* Free and unmap a consistent DMA buffer.
  * cpu_addr is what was returned from pci_alloc_consistent,
include/asm-sparc64/pgtable.h +17 -0
index f0a9b44..3d6dff2 100644
@@ -335,6 +335,23 @@ static inline void set_pte_at(struct mm_
 #define pte_clear(mm,addr,ptep)		\
 	set_pte_at((mm), (addr), (ptep), __pte(0UL))
 
+#ifdef DCACHE_ALIASING_POSSIBLE
+#define __HAVE_ARCH_MOVE_PTE
+#define move_pte(pte, prot, old_addr, new_addr)				\
+({									\
+ 	pte_t newpte = (pte);						\
+	if (pte_present(pte)) {						\
+		unsigned long this_pfn = pte_pfn(pte);			\
+									\
+		if (pfn_valid(this_pfn) &&				\
+		    (((old_addr) ^ (new_addr)) & (1 << 13)))		\
+			flush_dcache_page_all(current->mm,		\
+					      pfn_to_page(this_pfn));	\
+	}								\
+	newpte;								\
+})
+#endif
+
 extern pgd_t swapper_pg_dir[2048];
 extern pmd_t swapper_low_pmd_dir[2048];
 
include/linux/i2o.h +4 -1
index 5a9d8c5..6368e31 100644
@@ -1116,8 +1116,11 @@ static inline struct i2o_message *i2o_ms
 
 	mmsg->mfa = readl(c->in_port);
 	if (unlikely(mmsg->mfa >= c->in_queue.len)) {
+		u32 mfa = mmsg->mfa;
+
 		mempool_free(mmsg, c->in_msg.mempool);
-		if(mmsg->mfa == I2O_QUEUE_EMPTY)
+
+		if (mfa == I2O_QUEUE_EMPTY)
 			return ERR_PTR(-EBUSY);
 		return ERR_PTR(-EFAULT);
 	}
mm/shmem.c +1 -0
index f0eb2f2..1bc2285 100644
@@ -2100,6 +2100,7 @@ #endif
 	sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
 	sb->s_magic = TMPFS_MAGIC;
 	sb->s_op = &shmem_ops;
+	sb->s_time_gran = 1;
 
 	inode = shmem_get_inode(sb, S_IFDIR | mode, 0);
 	if (!inode)
#2 lore raw
In reply to Chris Wright
Quoted 2 lines · Chris Wright

We (the -stable team) are announcing the release of the 2.6.16.22 kernel. The diffstat and short summary of the fixes are below.

Perhaps I missed the discussion about it, but why is this not piped through linux-kernel-announce?

It isn't on kernel.org as well so it is hard to track it.

Thomas

Signature · 2 lines
 Thomas Vögtle    email: [email protected]
 ----- http://www.voegtle-clan.de/thomas ------
#3 lore raw
Quoted 8 lines · Thomas Voegtle
Quoted 3 lines · Chris Wright

We (the -stable team) are announcing the release of the 2.6.16.22 kernel. The diffstat and short summary of the fixes are below.

Quoted 6 lines

Perhaps I missed the discussion about it, but why is this not piped through linux-kernel-announce?

It isn't on kernel.org as well so it is hard to track it.

By the way, Adrian, is there still a plan to maintain the 2.6.16.x branch for a long time? If so, it would definitely make sense to keep the latest 2.6.16.x on the kernel.org banner.

Brice

#4 lore raw
Quoted 12 lines · Brice Goglin
Quoted 11 lines · Thomas Voegtle
Quoted 3 lines · Chris Wright

We (the -stable team) are announcing the release of the 2.6.16.22 kernel. The diffstat and short summary of the fixes are below.

Perhaps I missed the discussion about it, but why is this not piped through linux-kernel-announce?

Quoted 7 lines
Quoted 3 lines

It isn't on kernel.org as well so it is hard to track it.

By the way, Adrian, is there still a plan to maintain the 2.6.16.x branch for a long time?
...

Yes.

Quoted 1 line

Brice

cu
Adrian

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed
#5 lore raw
In reply to Thomas Voegtle
Quoted 6 lines · * Thomas Voegtle ([email protected]) wrote:
Quoted 2 lines · Chris Wright

We (the -stable team) are announcing the release of the 2.6.16.22 kernel. The diffstat and short summary of the fixes are below.

Perhaps I missed the discussion about it, but why is this not piped through linux-kernel-announce?

I stopped making those announcements separately because the automated versions were working well.

Quoted 1 line

It isn't on kernel.org as well so it is hard to track it.

Yeah, that's true, the automated logic that tracks that and generates the messages doesn't fit well with multiple -stable versions.

thanks,
-chris

#6 lore raw
Followup to:  <[email protected]>
By author:    Chris Wright <[email protected]>
In newsgroup: linux.dev.kernel
Quoted 9 lines · * Thomas Voegtle ([email protected]) wrote:
Quoted 6 lines · Chris Wright
Quoted 2 lines

We (the -stable team) are announcing the release of the 2.6.16.22 kernel. The diffstat and short summary of the fixes are below.

Perhaps I missed the discussion about it, but why is this not piped through linux-kernel-announce?

Quoted 8 lines

I stopped making those announcements separately because the automated versions were working well.

Quoted 1 line

It isn't on kernel.org as well so it is hard to track it.

Yeah, that's true, the automated logic that tracks that and generates the messages doesn't fit well with multiple -stable versions.

I may be able to fix that, assuming everything else remains constant (locations of git trees, etc.)

-hpa

#7 lore raw
Quoted 2 lines · * H. Peter Anvin ([email protected]) wrote:

I may be able to fix that, assuming everything else remains constant (locations of git trees, etc.)

Yeah, everything else remains constant, nothing moves. Let me know if there's anything I can do to help test or whatever.

thanks,
-chris