Linux 2.6.27.35
I'm announcing the release of the 2.6.27.35 kernel. All users of the 2.6.27 kernel series are very strongly encouraged to upgrade.
I'll also be replying to this message with a copy of the patch between 2.6.27.34 and 2.6.27.35
The updated 2.6.27.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.27.y.git
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.27.y.git;a=summarythanks,
greg k-h
------------
Makefile | 2 arch/powerpc/include/asm/mmu-hash64.h | 2 arch/powerpc/kernel/lparcfg.c | 3 + arch/powerpc/kernel/rtas.c | 7 ++- arch/powerpc/mm/slb.c | 16 +++++-- arch/powerpc/platforms/pseries/reconfig.c | 9 +++- drivers/ata/libata-core.c | 8 +++ drivers/char/tpm/tpm_tis.c | 12 ++--- drivers/ps3/ps3stor_lib.c | 65 ++++++++++++++++++++++++++++-- fs/binfmt_elf.c | 28 ++++++------ fs/nfsd/nfs3proc.c | 5 +- fs/nfsd/nfs4proc.c | 7 ++- fs/nfsd/nfsproc.c | 3 - fs/nfsd/vfs.c | 11 ++--- fs/udf/lowlevel.c | 7 ++- include/linux/nfsd/nfsd.h | 2 sound/pci/cs46xx/cs46xx_lib.h | 2 sound/pci/oxygen/oxygen_io.c | 11 ----- 18 files changed, 146 insertions(+), 54 deletions(-)
Brian King (1):
powerpc/pseries: Fix to handle slb resize across migration
Clemens Ladisch (1):
sound: oxygen: work around MCE when changing volume
David Shaw (1):
Short write in nfsd becomes a full write to the client
Geoff Levand (1):
powerpc/ps3: Workaround for flash memory I/O error
Greg Kroah-Hartman (1):
Linux 2.6.27.35
Jan Kara (1):
udf: Use device size when drive reported bogus number of written blocks
Jason Gunthorpe (1):
TPM: Fixup boot probe timeout for tpm_tis driver
Roland McGrath (1):
binfmt_elf: fix PT_INTERP bss handling
Sophie Hamilton (1):
ALSA: cs46xx - Fix minimum period size
Tejun Heo (1):
libata: fix off-by-one error in ata_tf_read_block()
Wei Yongjun (1):
nfsd: fix hung up of nfs client while sync write data to nfs server
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 27 -EXTRAVERSION = .34 +EXTRAVERSION = .35 NAME = Trembling Tortoise # *DOCUMENTATION*
arch/powerpc/include/asm/mmu-hash64.h +2 -0
@@ -41,6 +41,7 @@ extern char initial_stab[];#define SLB_NUM_BOLTED 3#define SLB_CACHE_ENTRIES 8 +#define SLB_MIN_SIZE 32/* Bits in the SLB ESID word */ #define SLB_ESID_V ASM_CONST(0x0000000008000000)/* valid */
@@ -299,6 +300,7 @@ extern void slb_flush_and_rebolt(void);extern void stab_initialize (unsigned long stab);extern void slb_vmalloc_update (void ); +extern void slb_set_size (u16 size);#endif /* __ASSEMBLY__ */ /*
arch/powerpc/kernel/lparcfg.c +3 -0
@@ -35,6 +35,7 @@#include <asm/prom.h> #include <asm/vdso_datapage.h> #include <asm/vio.h> +#include <asm/mmu.h> #define MODULE_VERS "1.8"#define MODULE_NAME "lparcfg"
@@ -485,6 +486,8 @@ static int pseries_lparcfg_data(struct seq_file *m, void *v)seq_printf (m,"shared_processor_mode=%d\n" , lppaca[0 ].shared_proc); +seq_printf (m,"slb_size=%d\n" , mmu_slb_size); +return 0 ; }
arch/powerpc/kernel/rtas.c +6 -1
@@ -38,6 +38,7 @@#include <asm/syscalls.h> #include <asm/smp.h> #include <asm/atomic.h> +#include <asm/mmu.h> struct rtas_t rtas = { .lock =SPIN_LOCK_UNLOCKED
@@ -665,6 +666,7 @@ static void rtas_percpu_suspend_me(void *info) {long rc;unsigned long msr_save; +u16 slb_size = mmu_slb_size;int cpu;struct rtas_suspend_me_data *data = (struct rtas_suspend_me_data *)info;
@@ -686,13 +688,16 @@ static void rtas_percpu_suspend_me(void *info)/* All other cpus are in H_JOIN, this cpu does * the suspend. */ +slb_set_size (SLB_MIN_SIZE );printk (KERN_DEBUG "calling ibm,suspend-me on cpu %i\n" ,smp_processor_id ()); data->error =rtas_call (data->token,0 ,1 ,NULL ); -if (data->error) +if (data->error) {printk (KERN_DEBUG "ibm,suspend-me returned %d\n" , data->error); +slb_set_size (slb_size); + } }else {printk (KERN_ERR "H_JOIN on cpu %i failed with rc = %ld\n" ,smp_processor_id (), rc);
arch/powerpc/mm/slb.c +12 -4
@@ -247,14 +247,22 @@ void switch_slb(struct task_struct *tsk, struct mm_struct *mm)static inline void patch_slb_encoding (unsigned int *insn_addr,unsigned int immed) { -/* Assume the instruction had a "0" immediate value, just -* "or" in the new value -*/ - *insn_addr |= immed; + *insn_addr = (*insn_addr &0xffff0000 ) | immed;flush_icache_range ((unsigned long )insn_addr,4 + (unsigned long )insn_addr); } +void slb_set_size (u16 size) +{ +extern unsigned int *slb_compare_rr_to_size; + +if (mmu_slb_size == size) +return ; + + mmu_slb_size = size; +patch_slb_encoding (slb_compare_rr_to_size, mmu_slb_size); +} +void slb_initialize (void ) {unsigned long linear_llp, vmalloc_llp, io_llp;
arch/powerpc/platforms/pseries/reconfig.c +8 -1
@@ -20,6 +20,7 @@#include <asm/machdep.h> #include <asm/uaccess.h> #include <asm/pSeries_reconfig.h> +#include <asm/mmu.h>
@@ -439,9 +440,15 @@ static int do_update_property(char *buf, size_t bufsize)if (!newprop)return -ENOMEM ; +if (!strcmp (name,"slb-size" ) || !strcmp (name,"ibm,slb-size" )) +slb_set_size (*(int *)value); + oldprop =of_find_property (np, name,NULL ); -if (!oldprop) +if (!oldprop) { +if (strlen (name)) +return prom_add_property (np, newprop);return -ENODEV ; + } rc =prom_update_property (np, newprop, oldprop);if (rc)
drivers/ata/libata-core.c +7 -1
@@ -565,7 +565,13 @@ u64 ata_tf_read_block(struct ata_taskfile *tf, struct ata_device *dev) head = tf->device &0xf ; sect = tf->lbal; - block = (cyl * dev->heads + head) * dev->sectors + sect; +if (!sect) { +ata_dev_printk (dev,KERN_WARNING ,"device reported " +"invalid CHS sector 0\n" ); + sect =1 ;/* oh well */ + } + + block = (cyl * dev->heads + head) * dev->sectors + sect -1 ; }return block;
drivers/char/tpm/tpm_tis.c +6 -6
@@ -450,6 +450,12 @@ static int tpm_tis_init(struct device *dev, resource_size_t start, goto out_err; } +/* Default timeouts */ + chip->vendor.timeout_a =msecs_to_jiffies (TIS_SHORT_TIMEOUT ); + chip->vendor.timeout_b =msecs_to_jiffies (TIS_LONG_TIMEOUT ); + chip->vendor.timeout_c =msecs_to_jiffies (TIS_SHORT_TIMEOUT ); + chip->vendor.timeout_d =msecs_to_jiffies (TIS_SHORT_TIMEOUT ); +if (request_locality (chip,0 ) !=0 ) { rc = -ENODEV ; goto out_err;
@@ -457,12 +463,6 @@ static int tpm_tis_init(struct device *dev, resource_size_t start, vendor =ioread32 (chip->vendor.iobase +TPM_DID_VID (0 )); -/* Default timeouts */ - chip->vendor.timeout_a =msecs_to_jiffies (TIS_SHORT_TIMEOUT ); - chip->vendor.timeout_b =msecs_to_jiffies (TIS_LONG_TIMEOUT ); - chip->vendor.timeout_c =msecs_to_jiffies (TIS_SHORT_TIMEOUT ); - chip->vendor.timeout_d =msecs_to_jiffies (TIS_SHORT_TIMEOUT ); -dev_info (dev,"1.2 TPM (device-id 0x%X, rev-id %d)\n" , vendor >>16 ,ioread8 (chip->vendor.iobase +TPM_RID (0 )));
drivers/ps3/ps3stor_lib.c +62 -3
89 lines not on this page · raw message
fs/binfmt_elf.c +14 -14
@@ -496,22 +496,22 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex, } } -/* -* Now fill out the bss section. First pad the last page up -* to the page boundary, and then perform a mmap to make sure -* that there are zero-mapped pages up to and including the -* last bss page. -*/ -if (padzero (elf_bss)) { - error = -EFAULT ; - goto out_close; - } +if (last_bss > elf_bss) { +/* +* Now fill out the bss section. First pad the last page up +* to the page boundary, and then perform a mmap to make sure +* that there are zero-mapped pages up to and including the +* last bss page. +*/ +if (padzero (elf_bss)) { + error = -EFAULT ; + goto out_close; + } -/* What we have mapped so far */ - elf_bss =ELF_PAGESTART (elf_bss +ELF_MIN_ALIGN -1 ); +/* What we have mapped so far */ + elf_bss =ELF_PAGESTART (elf_bss +ELF_MIN_ALIGN -1 ); -/* Map the last of the bss segment */ -if (last_bss > elf_bss) { +/* Map the last of the bss segment */ down_write (¤t->mm->mmap_sem); error =do_brk (elf_bss, last_bss - elf_bss);up_write (¤t->mm->mmap_sem);
fs/nfsd/nfs3proc.c +3 -2
@@ -201,6 +201,7 @@ nfsd3_proc_write(struct svc_rqst *rqstp, struct nfsd3_writeargs *argp, struct nfsd3_writeres *resp) {__be32 nfserr; +unsigned long cnt = argp->len; dprintk("nfsd: WRITE(3) %s %d bytes at %ld%s\n", SVCFH_fmt(&argp->fh),
@@ -213,9 +214,9 @@ nfsd3_proc_write(struct svc_rqst *rqstp, struct nfsd3_writeargs *argp, nfserr =nfsd_write (rqstp, &resp->fh,NULL , argp->offset, rqstp->rq_vec, argp->vlen, - argp->len, + &cnt, &resp->committed); - resp->count = argp->count; + resp->count = cnt;RETURN_STATUS (nfserr); }
fs/nfsd/nfs4proc.c +5 -2
@@ -685,6 +685,7 @@ nfsd4_write(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,struct file *filp =NULL ;u32 *p;__be32 status = nfs_ok; +unsigned long cnt;/* no need to check permission - this will be done in nfsd_write() */
@@ -703,7 +704,7 @@ nfsd4_write(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,return status; } - write->wr_bytes_written = write->wr_buflen; + cnt = write->wr_buflen; write->wr_how_written = write->wr_stable_how; p = (u32 *)write->wr_verifier.data; *p++ = nfssvc_boot.tv_sec;
@@ -711,10 +712,12 @@ nfsd4_write(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, status =nfsd_write (rqstp, &cstate->current_fh, filp, write->wr_offset, rqstp->rq_vec, write->wr_vlen, - write->wr_buflen, &write->wr_how_written); + &cnt, &write->wr_how_written);if (filp)fput (filp); + write->wr_bytes_written = cnt; +if (status == nfserr_symlink) status = nfserr_inval;return status;
fs/nfsd/nfsproc.c +2 -1
@@ -179,6 +179,7 @@ nfsd_proc_write(struct svc_rqst *rqstp, struct nfsd_writeargs *argp, {__be32 nfserr;int stable =1 ; +unsigned long cnt = argp->len; dprintk("nfsd: WRITE %s %d bytes at %d\n", SVCFH_fmt(&argp->fh),
@@ -187,7 +188,7 @@ nfsd_proc_write(struct svc_rqst *rqstp, struct nfsd_writeargs *argp, nfserr =nfsd_write (rqstp,fh_copy (&resp->fh, &argp->fh),NULL , argp->offset, rqstp->rq_vec, argp->vlen, - argp->len, + &cnt, &stable);return nfsd_return_attrs (nfserr, resp); }
fs/nfsd/vfs.c +6 -5
@@ -957,7 +957,7 @@ static void kill_suid(struct dentry *dentry)static __be32 nfsd_vfs_write (struct svc_rqst *rqstp,struct svc_fh *fhp,struct file *file,loff_t offset,struct kvec *vec,int vlen, -unsigned long cnt,int *stablep) +unsigned long *cnt,int *stablep) {struct svc_export *exp;struct dentry *dentry;
@@ -971,7 +971,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file, err = nfserr_perm;if ((fhp->fh_export->ex_flags &NFSEXP_MSNFS ) && - (!lock_may_write (file->f_path.dentry->d_inode, offset, cnt))) + (!lock_may_write (file->f_path.dentry->d_inode, offset, *cnt))) goto out;#endif
@@ -1003,7 +1003,8 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file, host_err =vfs_writev (file, (struct iovec __user *)vec, vlen, &offset);set_fs (oldfs);if (host_err >=0 ) { - nfsdstats.io_write += cnt; + *cnt = host_err; + nfsdstats.io_write += host_err;fsnotify_modify (file->f_path.dentry); }
@@ -1050,7 +1051,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,dprintk ("nfsd: write complete host_err=%d\n" , host_err);if (host_err >=0 ) err =0 ; -else +else err =nfserrno (host_err); out:return err;
@@ -1092,7 +1093,7 @@ out:*/ __be32 nfsd_write (struct svc_rqst *rqstp,struct svc_fh *fhp,struct file *file, -loff_t offset,struct kvec *vec,int vlen,unsigned long cnt, +loff_t offset,struct kvec *vec,int vlen,unsigned long *cnt,int *stablep) {__be32 err =0 ;
fs/udf/lowlevel.c +6 -1
@@ -56,7 +56,12 @@ unsigned long udf_get_last_block(struct super_block *sb)struct block_device *bdev = sb->s_bdev;unsigned long lblock =0 ; -if (ioctl_by_bdev (bdev,CDROM_LAST_WRITTEN , (unsigned long ) &lblock)) +/* +* ioctl failed or returned obviously bogus value? +* Try using the device size... +*/ +if (ioctl_by_bdev (bdev,CDROM_LAST_WRITTEN , (unsigned long ) &lblock) || + lblock ==0 ) lblock = bdev->bd_inode->i_size >> sb->s_blocksize_bits;if (lblock)
include/linux/nfsd/nfsd.h +1 -1
@@ -105,7 +105,7 @@ void nfsd_close(struct file *);__be32 nfsd_read (struct svc_rqst *,struct svc_fh *,struct file *,loff_t ,struct kvec *,int ,unsigned long *);__be32 nfsd_write (struct svc_rqst *,struct svc_fh *,struct file *, -loff_t ,struct kvec *,int ,unsigned long ,int *); +loff_t ,struct kvec *,int ,unsigned long *,int *);__be32 nfsd_readlink (struct svc_rqst *,struct svc_fh *,char *,int *); __be32 nfsd_symlink(struct svc_rqst *, struct svc_fh *,
sound/pci/cs46xx/cs46xx_lib.h +1 -1
@@ -35,7 +35,7 @@#ifdef CONFIG_SND_CS46XX_NEW_DSP -#define CS46XX_MIN_PERIOD_SIZE 1 +#define CS46XX_MIN_PERIOD_SIZE 64#define CS46XX_MAX_PERIOD_SIZE 1024*1024#else #define CS46XX_MIN_PERIOD_SIZE 2048
sound/pci/oxygen/oxygen_io.c +1 -10
@@ -214,17 +214,8 @@ EXPORT_SYMBOL(oxygen_write_spi);void oxygen_write_i2c (struct oxygen *chip,u8 device,u8 map,u8 data) { -unsigned long timeout; -/* should not need more than about 300 us */ - timeout = jiffies +msecs_to_jiffies (1 ); -do { -if (!(oxygen_read16 (chip,OXYGEN_2WIRE_BUS_STATUS ) - &OXYGEN_2WIRE_BUSY )) -break ; -udelay (1 ); -cond_resched (); - }while (time_after_eq (timeout, jiffies)); +msleep (1 );oxygen_write8 (chip,OXYGEN_2WIRE_MAP , map);oxygen_write8 (chip,OXYGEN_2WIRE_DATA , data);
Greg,
I notice the mismerge of mainline commit 170ebf85160dd128e1c4206cc197cce7d1424705
"bas_gigaset: correctly allocate USB interrupt transfer buffer" into 2.6.27-stable isn't fixed in this release yet. Is that just a timing problem, or do you still need anything from me?
Thanks,
Tilman
Signature · 4 lines
Tilman Schmidt E-Mail: [email protected] Bonn, Germany Diese Nachricht besteht zu 100% aus wiederverwerteten Bits. Ungeöffnet mindestens haltbar bis: (siehe Rückseite)
Quoted 7 lines · Tilman Schmidt
Greg,
I notice the mismerge of mainline commit
170ebf85160dd128e1c4206cc197cce7d1424705
"bas_gigaset: correctly allocate USB interrupt transfer buffer" into 2.6.27-stable isn't fixed in this release yet. Is that just a timing problem, or do you still need anything from me?
It was a timing problem, I should be resolving it now and queueing up the fix for the next .27 release.
thanks for your patience.
greg k-h