* Re: linux-next: net tree build warning
From: David Miller @ 2009-09-07 9:04 UTC (permalink / raw)
To: sfr; +Cc: linux-next, linux-kernel, shemminger
In-Reply-To: <20090904144232.1f6ccf45.sfr@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 4 Sep 2009 14:42:32 +1000
> Today's linux-next build (x86_64 allmodconfig gcc-4.4.0) produced this warning:
>
> drivers/net/r8169.c: In function 'rtl8169_start_xmit':
> drivers/net/r8169.c:3421: warning: label 'out' defined but not used
>
> Introduced by commit 61357325f377889a1daffa14962d705dc814dd0e ("netdev:
> convert bulk of drivers to netdev_tx_t").
Thanks for the report, I'll commit the fix below.
Also, Stephen Hemminger has fixed the dlci WAN driver warning
you reported too.
r8169: Fix warning in rtl8169_start_xmit().
Reported by Stephen Rothwell:
drivers/net/r8169.c: In function 'rtl8169_start_xmit':
drivers/net/r8169.c:3421: warning: label 'out' defined but not used
Introduced by commit 61357325f377889a1daffa14962d705dc814dd0e ("netdev:
convert bulk of drivers to netdev_tx_t").
Signed-off-by: David S. Miller <davem@davemloft.net>
---
drivers/net/r8169.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index a91e9b3..50c6a3c 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -3416,7 +3416,6 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb,
netif_wake_queue(dev);
}
-out:
return NETDEV_TX_OK;
err_stop:
--
1.6.4.2
^ permalink raw reply related
* Re: linux-next: slab tree build failure
From: Heiko Carstens @ 2009-09-07 9:04 UTC (permalink / raw)
To: Pekka Enberg
Cc: Stephen Rothwell, Christoph Lameter, linux-next, linux-kernel,
Luis R. Rodriguez, John W. Linville, Catalin Marinas, npiggin
In-Reply-To: <1252309426.4964.3.camel@penberg-laptop>
On Mon, Sep 07, 2009 at 10:43:46AM +0300, Pekka Enberg wrote:
> Aah, let me guess, CONFIG_SLQB? I guess I'll just rebase the damn tree
> and make it non-default. We need that anyway if we want to merge it to
> 2.6.32. I'll take a stab at it later this evening (my time zone).
Will SLQB be merged during the next merge window? Just realized that s390
doesn't boot with CONFIG_SLQB (crashes before the console is active).
I tend to ignore bugs which seem to be related to SLQB in linux-next,
but if it gets merged I might need to look deeper into this.
^ permalink raw reply
* linux-next: manual merge of the tty tree with the tree
From: Stephen Rothwell @ 2009-09-07 9:13 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Linus Torvalds, Joe Peterson
Hi Greg,
Today's linux-next merge of the tty tree got a conflict in
drivers/char/n_tty.c between commit
37f81fa1f63ad38e16125526bb2769ae0ea8d332 ("n_tty: do O_ONLCR translation
as a single write") from Linus' tree and commit
bb2d17d83926bf9d70b922031aeb49ca896e0b3d ("tty: n_tty: honor opost flag
for echoes") from the tty tree.
I fixed it up (see below) and can carry the fix for a while.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/char/n_tty.c
index 4e28b35,71308b6..0000000
--- a/drivers/char/n_tty.c
+++ b/drivers/char/n_tty.c
@@@ -292,53 -292,56 +292,55 @@@ static int do_output_char(unsigned cha
if (!space)
return -1;
- switch (c) {
- case '\n':
- if (O_ONLRET(tty))
- tty->column = 0;
- if (O_ONLCR(tty)) {
- if (space < 2)
- return -1;
- tty->canon_column = tty->column = 0;
- tty->ops->write(tty, "\r\n", 2);
- return 2;
- }
- tty->canon_column = tty->column;
- break;
- case '\r':
- if (O_ONOCR(tty) && tty->column == 0)
- return 0;
- if (O_OCRNL(tty)) {
- c = '\n';
+ if (O_OPOST(tty)) {
+ switch (c) {
+ case '\n':
if (O_ONLRET(tty))
+ tty->column = 0;
+ if (O_ONLCR(tty)) {
+ if (space < 2)
+ return -1;
tty->canon_column = tty->column = 0;
- tty_put_char(tty, '\r');
- tty_put_char(tty, c);
++ tty->ops->write(tty, "\r\n", 2);
+ return 2;
+ }
+ tty->canon_column = tty->column;
break;
- }
- tty->canon_column = tty->column = 0;
- break;
- case '\t':
- spaces = 8 - (tty->column & 7);
- if (O_TABDLY(tty) == XTABS) {
- if (space < spaces)
- return -1;
+ case '\r':
+ if (O_ONOCR(tty) && tty->column == 0)
+ return 0;
+ if (O_OCRNL(tty)) {
+ c = '\n';
+ if (O_ONLRET(tty))
+ tty->canon_column = tty->column = 0;
+ break;
+ }
+ tty->canon_column = tty->column = 0;
+ break;
+ case '\t':
+ spaces = 8 - (tty->column & 7);
+ if (O_TABDLY(tty) == XTABS) {
+ if (space < spaces)
+ return -1;
+ tty->column += spaces;
+ tty->ops->write(tty, " ", spaces);
+ return spaces;
+ }
tty->column += spaces;
- tty->ops->write(tty, " ", spaces);
- return spaces;
- }
- tty->column += spaces;
- break;
- case '\b':
- if (tty->column > 0)
- tty->column--;
- break;
- default:
- if (!iscntrl(c)) {
- if (O_OLCUC(tty))
- c = toupper(c);
- if (!is_continuation(c, tty))
- tty->column++;
+ break;
+ case '\b':
+ if (tty->column > 0)
+ tty->column--;
+ break;
+ default:
+ if (!iscntrl(c)) {
+ if (O_OLCUC(tty))
+ c = toupper(c);
+ if (!is_continuation(c, tty))
+ tty->column++;
+ }
+ break;
}
- break;
}
tty_put_char(tty, c);
^ permalink raw reply
* Re: linux-next: slab tree build failure
From: Pekka Enberg @ 2009-09-07 9:22 UTC (permalink / raw)
To: Heiko Carstens
Cc: Stephen Rothwell, Christoph Lameter, linux-next, linux-kernel,
Luis R. Rodriguez, John W. Linville, Catalin Marinas, npiggin,
Sachin P. Sant, Andrew Morton, Ingo Molnar
In-Reply-To: <20090907090441.GB4717@osiris.boeblingen.de.ibm.com>
Hi Heiko,
On Mon, Sep 07, 2009 at 10:43:46AM +0300, Pekka Enberg wrote:
>> Aah, let me guess, CONFIG_SLQB? I guess I'll just rebase the damn tree
>> and make it non-default. We need that anyway if we want to merge it to
>> 2.6.32. I'll take a stab at it later this evening (my time zone).
On Mon, Sep 7, 2009 at 12:04 PM, Heiko
Carstens<heiko.carstens@de.ibm.com> wrote:
> Will SLQB be merged during the next merge window? Just realized that s390
> doesn't boot with CONFIG_SLQB (crashes before the console is active).
>
> I tend to ignore bugs which seem to be related to SLQB in linux-next,
> but if it gets merged I might need to look deeper into this.
Yes, that's the plan. That said, there's a long-standing PPC boot-time
bug in SLQB that's still unfixed which could affect other archs as
well AFAICT. Help in tracking that down would be appreciated as Nick
seems to be busy atm.
I am not completely happy with sending something that's known to be
broken to Linus. However, the problem is not getting fixed in slab.git
and everyone seems to be in favor of merging the allocator and mark it
as "experimental" so I'll probably just send it Linus' way for 2.6.32
and let him decide whether to take it or not.
Pekka
^ permalink raw reply
* Re: linux-next: net tree build warning
From: Stephen Rothwell @ 2009-09-07 9:37 UTC (permalink / raw)
To: David Miller; +Cc: linux-next, linux-kernel, shemminger
In-Reply-To: <20090907.020423.151248729.davem@davemloft.net>
[-- Attachment #1: Type: text/plain, Size: 389 bytes --]
Hi Dave, Stephen,
On Mon, 07 Sep 2009 02:04:23 -0700 (PDT) David Miller <davem@davemloft.net> wrote:
>
> Thanks for the report, I'll commit the fix below.
>
> Also, Stephen Hemminger has fixed the dlci WAN driver warning
> you reported too.
Thanks for both of these.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* linux-next: scsi-post-merge tree build failure
From: Stephen Rothwell @ 2009-09-07 10:06 UTC (permalink / raw)
To: James Bottomley
Cc: linux-next, linux-kernel, Jayamohan Kallickal, Mike Christie
[-- Attachment #1: Type: text/plain, Size: 507 bytes --]
Hi James,
Today's linux-next build (powerpc allyesconfig) failed like this:
drivers/scsi/be2iscsi/be_main.c: In function 'hwi_write_buffer':
drivers/scsi/be2iscsi/be_main.c:1481: error: implicit declaration of function 'virt_to_bus'
Caused by commit 9316dc3deb9675c674f96a0c6fb74ccc6c497fae ("[SCSI]
be2iscsi: add 10Gbps iSCSI - BladeEngine 2 driver") which I have reverted
for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the percpu tree with Linus' tree
From: Stephen Rothwell @ 2009-09-07 10:24 UTC (permalink / raw)
To: Tejun Heo
Cc: Rusty Russell, Christoph Lameter, Ingo Molnar, linux-next,
linux-kernel
In-Reply-To: <4AA4C628.3070300@kernel.org>
[-- Attachment #1: Type: text/plain, Size: 561 bytes --]
Hi Tejun,
On Mon, 07 Sep 2009 17:36:56 +0900 Tejun Heo <tj@kernel.org> wrote:
>
> Stephen Rothwell wrote:
> >
> > I *think* the changes in the percpu tree supercede those in Linus' tree,
> > so I have used those.
>
> Yes, the changes in Linus's tree are backported from devel branch but
> the devel already has moved on and dropped one of the changes. I'll
> merge Linus's tree into percpu devel branch.
Thanks for the confirmation.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* linux-next: security-testing tree build failure
From: Stephen Rothwell @ 2009-09-07 10:38 UTC (permalink / raw)
To: James Morris; +Cc: linux-next, linux-kernel, David Howells
[-- Attachment #1: Type: text/plain, Size: 699 bytes --]
Hi ,
Today's linux-next build (sparc64 defconfig) failed like this:
cc1: warnings being treated as errors
include/linux/security.h:3012: error: 'security_key_session_to_parent' declared 'static' but never defined
Caused by commit ee18d64c1f632043a02e6f5ba5e045bb26a5465f ("KEYS: Add a
keyctl to install a process's session keyring on its parent [try #6]")
which I have reverted for today.
(I also reverted commit 945af7c3289c26c9070d6b1bf3ca759d36643e0b ("KEYS:
security_cred_alloc_blank() should return int under all circumstances")
which is a fix for the above commit.)
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* linux-next: Tree for September 7
From: Stephen Rothwell @ 2009-09-07 11:02 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 10254 bytes --]
Hi all,
Changes since 20090904:
The acpi tree still has a build failure so I used the version from
next-20090831.
The async_tx tree gained a build failure so I used the version from
next-20090904.
The mtd tree gained a conflict against the i2c tree.
The battery tree gained a conflict against Linus' tree.
The slab tree exposed a build failure in the wireless tree, so I reverted
a commit from there.
The security-testing tree lost its build failure but gained another for
which I reverted a commit.
The trivial tree gained conflicts against the scsi and arm trees.
The percpu tree gained a conflict against Linus' tree.
The tty tree gained a conflict against Linus' tree.
The scsi-post-merge tree gained a build failure for which I reverted a
commit.
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/v2.6/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" as mentioned in the FAQ on the wiki
(see below).
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log files
in the Next directory. Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the
final fixups (if any), it is also built with powerpc allnoconfig (32 and
64 bit), ppc44x_defconfig and allyesconfig (minus
CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc
and sparc64 defconfig. These builds also have
CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and
CONFIG_DEBUG_INFO disabled when necessary.
Below is a summary of the state of the merge.
We are up to 141 trees (counting Linus' and 21 trees of patches pending for
Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Jan Dittmer for adding the linux-next tree to his build tests
at http://l4x.org/k/ , the guys at http://test.kernel.org/ and Randy
Dunlap for doing many randconfig builds.
There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
$ git checkout master
$ git reset --hard stable
Merging origin/master
Merging fixes/fixes
Merging arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging sparc-current/master
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging kbuild-current/master
Merging quilt/driver-core.current
Merging quilt/tty.current
Merging quilt/usb.current
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-linus
Merging audit-current/for-linus
Merging crypto-current/master
Merging ide-curent/master
Merging dwmw2/master
Merging arm/devel
Merging davinci/for-next
Merging pxa/for-next
Merging thumb-2/thumb-2
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
Merging parisc/next
Merging powerpc/next
CONFLICT (content): Merge conflict in kernel/gcov/Kconfig
Merging 4xx/next
Merging galak/next
Merging s390/features
Merging sh/master
Merging sparc/master
Merging xtensa/master
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/next
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging jfs/next
Merging nfs/linux-next
Merging nfsd/nfsd-next
CONFLICT (content): Merge conflict in net/sunrpc/cache.c
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
Merging ubifs/linux-next
Merging xfs/master
CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_lrw.c
Merging reiserfs-bkl/reiserfs/kill-bkl
Merging vfs/for-next
Merging pci/linux-next
CONFLICT (content): Merge conflict in arch/powerpc/kernel/pci_64.c
Applying: pci: merge fixup for fundamental reset conflict with powerpc tree
Merging hid/for-next
Merging quilt/i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
CONFLICT (content): Merge conflict in drivers/media/video/gspca/Kconfig
CONFLICT (content): Merge conflict in drivers/media/video/sh_mobile_ceu_camera.c
Merging quota/for_next
Merging kbuild/master
Merging kconfig/for-next
CONFLICT (content): Merge conflict in scripts/extract-ikconfig
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
$ git reset --hard HEAD^
Merging refs/next/20090831/acpi
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/master
Merging dlm/next
Merging scsi/master
Merging async_tx/next
$ git reset --hard HEAD^
Merging refs/next/20090904/async_tx
Merging net/master
Merging wireless/master
Merging mtd/master
CONFLICT (content): Merge conflict in drivers/mtd/mtdcore.c
Merging crypto/master
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
CONFLICT (content): Merge conflict in drivers/net/virtio_net.c
Merging mmc/next
Merging input/next
CONFLICT (content): Merge conflict in drivers/base/platform.c
Merging lsm/for-next
Merging block/for-next
CONFLICT (content): Merge conflict in fs/ubifs/super.c
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
Merging battery/master
CONFLICT (content): Merge conflict in drivers/power/wm97xx_battery.c
Merging leds/for-mm
Merging backlight/for-mm
Merging kgdb/kgdb-next
Merging slab/for-next
[master 81a4eb7] Revert "cfg80211: clear cfg80211_inform_bss() from kmemleak reports"
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
CONFLICT (content): Merge conflict in drivers/input/misc/Kconfig
Merging hdlc/hdlc-next
Merging drm/drm-next
CONFLICT (content): Merge conflict in firmware/Makefile
Merging voltage/for-next
CONFLICT (content): Merge conflict in drivers/regulator/Kconfig
Merging security-testing/next
CONFLICT (content): Merge conflict in arch/arm/kernel/signal.c
CONFLICT (content): Merge conflict in arch/parisc/include/asm/thread_info.h
CONFLICT (content): Merge conflict in arch/parisc/kernel/entry.S
CONFLICT (content): Merge conflict in arch/parisc/kernel/signal.c
Applying: security: fix merge for tun_struct changes
Merging lblnet/master
CONFLICT (content): Merge conflict in drivers/net/tun.c
Merging agp/agp-next
CONFLICT (content): Merge conflict in drivers/char/agp/uninorth-agp.c
Merging uwb/for-upstream
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
CONFLICT (delete/modify): arch/arm/mach-w90x900/w90p910.c deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/arm/mach-w90x900/w90p910.c left in tree.
CONFLICT (content): Merge conflict in drivers/scsi/mpt2sas/mpt2sas_scsih.c
$ git rm -f arch/arm/mach-w90x900/w90p910.c
Merging audit/for-next
Merging omap/for-next
Merging quilt/aoe
Merging suspend/linux-next
Merging bluetooth/master
Merging fsnotify/for-next
Merging irda/for-next
Merging hwlat/for-linus
Merging drbd/drbd
Merging kmemleak/kmemleak
Merging tip/auto-latest
CONFLICT (content): Merge conflict in arch/x86/include/asm/socket.h
CONFLICT (content): Merge conflict in arch/x86/kernel/setup.c
CONFLICT (content): Merge conflict in drivers/pci/dmar.c
CONFLICT (content): Merge conflict in drivers/pci/intel-iommu.c
CONFLICT (content): Merge conflict in include/linux/rcupdate.h
CONFLICT (content): Merge conflict in kernel/fork.c
Applying: tip: fix merge for cupmask update
Merging oprofile/for-next
CONFLICT (content): Merge conflict in kernel/trace/ring_buffer.c
Merging edac-amd/for-next
CONFLICT (content): Merge conflict in arch/x86/kernel/smpboot.c
CONFLICT (content): Merge conflict in include/linux/topology.h
Merging percpu/for-next
CONFLICT (content): Merge conflict in arch/sh/kernel/vmlinux.lds.S
CONFLICT (content): Merge conflict in kernel/sched.c
CONFLICT (content): Merge conflict in mm/percpu.c
Merging sfi/sfi-test
CONFLICT (content): Merge conflict in arch/x86/kernel/setup.c
Merging asm-generic/next
Merging hwpoison/hwpoison
Merging quilt/driver-core
CONFLICT (content): Merge conflict in drivers/base/class.c
CONFLICT (content): Merge conflict in drivers/mtd/mtdcore.c
CONFLICT (content): Merge conflict in init/main.c
Merging quilt/tty
CONFLICT (content): Merge conflict in arch/x86/include/asm/termios.h
CONFLICT (content): Merge conflict in drivers/char/n_tty.c
Merging quilt/usb
Merging quilt/staging
CONFLICT (delete/modify): drivers/staging/at76_usb/at76_usb.c deleted in quilt/staging and modified in HEAD. Version HEAD of drivers/staging/at76_usb/at76_usb.c left in tree.
CONFLICT (delete/modify): drivers/staging/epl/VirtualEthernetLinux.c deleted in quilt/staging and modified in HEAD. Version HEAD of drivers/staging/epl/VirtualEthernetLinux.c left in tree.
$ git rm -f drivers/staging/epl/VirtualEthernetLinux.c
$ git rm -f drivers/staging/at76_usb/at76_usb.c
Merging scsi-post-merge/master
[master 229d357] Revert "[SCSI] be2iscsi: add 10Gbps iSCSI - BladeEngine 2 driver"
[master e8d0b8f] Revert "KEYS: security_cred_alloc_blank() should return int under all circumstances"
[master a383b61] Revert "KEYS: Add a keyctl to install a process's session keyring on its parent [try #6]"
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* Re: linux-next: security-testing/net tree build failure
From: Michael S. Tsirkin @ 2009-09-07 10:59 UTC (permalink / raw)
To: Stephen Rothwell
Cc: James Morris, linux-next, linux-kernel, Paul Moore,
David S. Miller
In-Reply-To: <20090903161432.44af630d.sfr@canb.auug.org.au>
On Thu, Sep 03, 2009 at 04:14:32PM +1000, Stephen Rothwell wrote:
> I applied the following merge fix patch (which I can carry as necessary):
Looks good to me.
^ permalink raw reply
* [PATCH] KEYS: Fix default security_session_to_parent()
From: David Howells @ 2009-09-07 12:24 UTC (permalink / raw)
To: jmorris, sfr; +Cc: linux-next, linux-kernel, David Howells
In-Reply-To: <20090907203857.023912f8.sfr@canb.auug.org.au>
Fix the default security_session_to_parent() in linux/security.h to have a
body.
Signed-off-by: David Howells <dhowells@redhat.com>
---
include/linux/security.h | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/include/linux/security.h b/include/linux/security.h
index f4eb32d..10a0925 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -2988,7 +2988,10 @@ static inline int security_key_getsecurity(struct key *key, char **_buffer)
static inline int security_key_session_to_parent(const struct cred *cred,
const struct cred *parent_cred,
- struct key *key);
+ struct key *key)
+{
+ return 0;
+}
#endif
#endif /* CONFIG_KEYS */
^ permalink raw reply related
* Re: [PATCH] KEYS: Fix default security_session_to_parent()
From: James Morris @ 2009-09-07 12:36 UTC (permalink / raw)
To: David Howells; +Cc: sfr, linux-next, linux-kernel
In-Reply-To: <20090907122417.754.63235.stgit@warthog.procyon.org.uk>
On Mon, 7 Sep 2009, David Howells wrote:
> Fix the default security_session_to_parent() in linux/security.h to have a
> body.
>
> Signed-off-by: David Howells <dhowells@redhat.com>
Thanks!
Applied to
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6#next
--
James Morris
<jmorris@namei.org>
^ permalink raw reply
* linux-next: security-testing tree build failure
From: Stephen Rothwell @ 2009-09-07 13:40 UTC (permalink / raw)
To: James Morris; +Cc: linux-next, LKML, David Howells, Russell King
[-- Attachment #1: Type: text/plain, Size: 541 bytes --]
Hi David,
Today's linux-next build (arm lots of configs) failed like this:
arch/arm/kernel/signal.c: In function 'do_notify_resume':
arch/arm/kernel/signal.c:701: error: implicit declaration of function 'tracehook_notify_resume'
Caused by commit d0420c83f39f79afb82010c2d2cafd150eef651b ("KEYS: Extend
TIF_NOTIFY_RESUME to (almost) all architectures [try #6]"). Presumably
the include of linux/tracehook.h is missing.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* Re: linux-next: security-testing tree build failure
From: Stephen Rothwell @ 2009-09-07 13:43 UTC (permalink / raw)
To: James Morris; +Cc: linux-next, LKML, David Howells, Russell King
In-Reply-To: <20090907234028.6728eb5e.sfr@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 745 bytes --]
On Mon, 7 Sep 2009 23:40:28 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next build (arm lots of configs) failed like this:
>
> arch/arm/kernel/signal.c: In function 'do_notify_resume':
> arch/arm/kernel/signal.c:701: error: implicit declaration of function 'tracehook_notify_resume'
>
> Caused by commit d0420c83f39f79afb82010c2d2cafd150eef651b ("KEYS: Extend
> TIF_NOTIFY_RESUME to (almost) all architectures [try #6]"). Presumably
> the include of linux/tracehook.h is missing.
The avr32 defconfig build fails the same way as well. Thee may be
others, that is as far as we have gone so far.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* Re: linux-next: acpi tree build failure
From: Stephen Rothwell @ 2009-09-07 13:46 UTC (permalink / raw)
To: Len Brown; +Cc: linux-next, linux-kernel, Zhang Rui, linux-acpi
In-Reply-To: <20090901125748.fb33b2ea.sfr@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 617 bytes --]
Hi Len,
On Tue, 1 Sep 2009 12:57:48 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next build (x86_64 allmodconfig) failed like this:
>
> drivers/acpi/als.c: In function 'acpi_als_get_mappings':
> drivers/acpi/als.c:173: error: expected ')' before 'PREFIX'
> drivers/acpi/als.c: In function 'acpi_als_add':
> drivers/acpi/als.c:347: error: expected ')' before 'PREFIX'
>
> I have used the version of the acpi tree from next-20090831 for today.
This is still there ...
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the trivial tree with the scsi tree
From: Jiri Kosina @ 2009-09-07 15:10 UTC (permalink / raw)
To: Stephen Rothwell, James Bottomley
Cc: linux-next, linux-kernel, Kashyap, Desai, Uwe Kleine-Koenig
In-Reply-To: <20090907162349.3b3337e3.sfr@canb.auug.org.au>
On Mon, 7 Sep 2009, Stephen Rothwell wrote:
> Hi Jiri,
>
> Today's linux-next merge of the trivial tree got a conflict in
> drivers/scsi/mpt2sas/mpt2sas_scsih.c between commit
> 155dd4c763694222c125e65438d823f58ea653bc ("[SCSI] mpt2sas: Prevent
> sending command to FW while Host Reset") from the scsi tree and commit
> 8eaa1cbfd596aeb0d2fec7706faccab42eb4bf62 ("trivial: fix typos "man[ae]g?
> ment" -> "management"") from the trivial tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
>
> Jiri, maybe the scsi part of that trivial patch could be sent to the scsi
> maintainer.
Sure, here we go. James, could you please apply? (I have already dropped
it from trivial queue). Thanks.
From: Uwe Kleine-Koenig <u.kleine-koenig@pengutronix.de>
Subject: trivial: fix typos "man[ae]g?ment" -> "management"
Signed-off-by: Uwe Kleine-Koenig <u.kleine-koenig@pengutronix.de>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.h b/drivers/scsi/mpt2sas/mpt2sas_base.h
index 286c185..fa85253 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_base.h
+++ b/drivers/scsi/mpt2sas/mpt2sas_base.h
@@ -434,7 +434,7 @@ typedef void (*MPT_ADD_SGE)(void *paddr, u32 flags_length, dma_addr_t dma_addr);
* @ioc_reset_in_progress: host reset in progress
* @ioc_reset_in_progress_lock:
* @ioc_link_reset_in_progress: phy/hard reset in progress
- * @ignore_loginfos: ignore loginfos during task managment
+ * @ignore_loginfos: ignore loginfos during task management
* @remove_host: flag for when driver unloads, to avoid sending dev resets
* @wait_for_port_enable_to_complete:
* @msix_enable: flag indicating msix is enabled
diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
index 2a01a5f..e849fc7 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
@@ -2633,7 +2633,7 @@ _scsih_qcmd(struct scsi_cmnd *scmd, void (*done)(struct scsi_cmnd *))
return 0;
}
- /* see if we are busy with task managment stuff */
+ /* see if we are busy with task management stuff */
spin_lock_irqsave(&ioc->ioc_reset_in_progress_lock, flags);
if (sas_target_priv_data->tm_busy ||
ioc->shost_recovery || ioc->ioc_link_reset_in_progress) {
@@ -5857,7 +5857,7 @@ _scsih_init(void)
/* queuecommand callback hander */
scsi_io_cb_idx = mpt2sas_base_register_callback_handler(_scsih_io_done);
- /* task managment callback handler */
+ /* task management callback handler */
tm_cb_idx = mpt2sas_base_register_callback_handler(_scsih_tm_done);
/* base internal commands callback handler */
^ permalink raw reply related
* Re: linux-next: manual merge of the trivial tree with the arm tree
From: Jiri Kosina @ 2009-09-07 15:14 UTC (permalink / raw)
To: Stephen Rothwell, Russell King
Cc: linux-next, linux-kernel, Joe Perches, wanzongshun
In-Reply-To: <20090907163201.72adc3f6.sfr@canb.auug.org.au>
On Mon, 7 Sep 2009, Stephen Rothwell wrote:
> Today's linux-next merge of the trivial tree got a conflict in
> arch/arm/mach-w90x900/w90p910.c between commit
> 35c9221acb133ecc9abd701a1fb6fa909d177a77 ("ARM: 5682/1: Add cpu.c and
> dev.c and modify some files of w90p910 platform") from the arm tree and
> commit 6f8fadf4a5c43f9f10f1910c71d8d9ff0b0a26ca ("trivial: remove
> unnecessary semicolons") from the trivial tree.
>
> The former commit moved the code changed by the latter into a different
> file (arch/arm/mach-w90x900/cpu.c - and removed the old file). Its not
> important enough to fix it there (so I just removed this file), but maybe
> the part of the trivial commit touching this file could be sent to the
> arm maintainer.
Sure, here we go. Russel, could you please apply this on top of your
current tree? (I have already dropped the bits touching arch/arm from
trivial queue). Thanks.
From: Joe Perches <joe@perches.com>
Subject: trivial: remove unnecessary semicolons
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
---
diff --git a/arch/arm/mach-at91/at91cap9_devices.c b/arch/arm/mach-at91/at91cap9_devices.c
index 412aa49..799c11e 100644
--- a/arch/arm/mach-at91/at91cap9_devices.c
+++ b/arch/arm/mach-at91/at91cap9_devices.c
@@ -171,7 +171,7 @@ void __init at91_add_device_usba(struct usba_platform_data *data)
*/
usba_udc_data.pdata.vbus_pin = -EINVAL;
usba_udc_data.pdata.num_ep = ARRAY_SIZE(usba_udc_ep);
- memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep));;
+ memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep));
if (data && data->vbus_pin > 0) {
at91_set_gpio_input(data->vbus_pin, 0);
diff --git a/arch/arm/mach-at91/at91sam9rl_devices.c b/arch/arm/mach-at91/at91sam9rl_devices.c
index 7281865..e87237b 100644
--- a/arch/arm/mach-at91/at91sam9rl_devices.c
+++ b/arch/arm/mach-at91/at91sam9rl_devices.c
@@ -99,7 +99,7 @@ void __init at91_add_device_usba(struct usba_platform_data *data)
*/
usba_udc_data.pdata.vbus_pin = -EINVAL;
usba_udc_data.pdata.num_ep = ARRAY_SIZE(usba_udc_ep);
- memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep));;
+ memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep));
if (data && data->vbus_pin > 0) {
at91_set_gpio_input(data->vbus_pin, 0);
diff --git a/arch/arm/mach-w90x900/w90p910.c b/arch/arm/mach-w90x900/w90p910.c
index 1c97e49..0399a24 100644
--- a/arch/arm/mach-w90x900/w90p910.c
+++ b/arch/arm/mach-w90x900/w90p910.c
@@ -62,7 +62,7 @@ static DEFINE_CLK(atapi, 6);
static DEFINE_CLK(emc, 7);
static DEFINE_CLK(usbd, 8);
static DEFINE_CLK(usbh, 9);
-static DEFINE_CLK(g2d, 10);;
+static DEFINE_CLK(g2d, 10);
static DEFINE_CLK(pwm, 18);
static DEFINE_CLK(ps2, 24);
static DEFINE_CLK(kpi, 25);
diff --git a/arch/arm/plat-mxc/irq.c b/arch/arm/plat-mxc/irq.c
index 8aee763..c2106d5 100644
--- a/arch/arm/plat-mxc/irq.c
+++ b/arch/arm/plat-mxc/irq.c
@@ -53,7 +53,7 @@ int imx_irq_set_priority(unsigned char irq, unsigned char prio)
unsigned int mask = 0x0F << irq % 8 * 4;
if (irq >= MXC_INTERNAL_IRQS)
- return -EINVAL;;
+ return -EINVAL;
temp = __raw_readl(avic_base + AVIC_NIPRIORITY(irq / 8));
temp &= ~mask;
^ permalink raw reply related
* Re: linux-next: manual merge of the trivial tree with the arm tree
From: Russell King @ 2009-09-07 15:17 UTC (permalink / raw)
To: Jiri Kosina
Cc: Stephen Rothwell, linux-next, linux-kernel, Joe Perches,
wanzongshun
In-Reply-To: <alpine.LNX.2.00.0909071713210.23856@wotan.suse.de>
On Mon, Sep 07, 2009 at 05:14:38PM +0200, Jiri Kosina wrote:
> On Mon, 7 Sep 2009, Stephen Rothwell wrote:
>
> > Today's linux-next merge of the trivial tree got a conflict in
> > arch/arm/mach-w90x900/w90p910.c between commit
> > 35c9221acb133ecc9abd701a1fb6fa909d177a77 ("ARM: 5682/1: Add cpu.c and
> > dev.c and modify some files of w90p910 platform") from the arm tree and
> > commit 6f8fadf4a5c43f9f10f1910c71d8d9ff0b0a26ca ("trivial: remove
> > unnecessary semicolons") from the trivial tree.
> >
> > The former commit moved the code changed by the latter into a different
> > file (arch/arm/mach-w90x900/cpu.c - and removed the old file). Its not
> > important enough to fix it there (so I just removed this file), but maybe
> > the part of the trivial commit touching this file could be sent to the
> > arm maintainer.
>
> Sure, here we go. Russel, could you please apply this on top of your
> current tree? (I have already dropped the bits touching arch/arm from
> trivial queue). Thanks.
I'll have to split it up further, since I keep each platform class who
choses to send their stuff via me in separate branches.
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of:
^ permalink raw reply
* Re: linux-next: manual merge of the trivial tree with the scsi tree
From: Uwe Kleine-König @ 2009-09-07 15:19 UTC (permalink / raw)
To: Jiri Kosina
Cc: Stephen Rothwell, James Bottomley, linux-next, linux-kernel,
Kashyap, Desai
In-Reply-To: <alpine.LNX.2.00.0909071708400.23856@wotan.suse.de>
Hello,
On Mon, Sep 07, 2009 at 05:10:33PM +0200, Jiri Kosina wrote:
> From: Uwe Kleine-Koenig <u.kleine-koenig@pengutronix.de>
> Subject: trivial: fix typos "man[ae]g?ment" -> "management"
>
> Signed-off-by: Uwe Kleine-Koenig <u.kleine-koenig@pengutronix.de>
preferably with an 'ö' instead of 'oe' ...
Thanks
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply
* Re: linux-next: Tree for September 4
From: Stephen Rothwell @ 2009-09-07 16:19 UTC (permalink / raw)
To: Borislav Petkov; +Cc: linux-next, LKML
In-Reply-To: <20090904104540.GC28389@aftab>
[-- Attachment #1: Type: text/plain, Size: 540 bytes --]
Hi Borislav,
On Fri, 4 Sep 2009 12:45:40 +0200 Borislav Petkov <borislav.petkov@amd.com> wrote:
>
> current topology patches in -tip have significantly diverged from the
> versions I carry in the edac tree so please remove the last from the
> testing lineup temporarily. Will fix the issue after I'm back from my
> vacation the week after next.
OK, done. Just let me know when you have returned and I will reinstate it.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* Next Sept 7: Bug : skb_release_head_state on x86
From: Sachin Sant @ 2009-09-07 16:49 UTC (permalink / raw)
To: netdev; +Cc: Stephen Rothwell, linux-next, David Miller
In-Reply-To: <20090907210206.7830ba68.sfr@canb.auug.org.au>
Today's next kernel running on a x86 box crashed with
BUG: unable to handle kernel paging request at 00010090
IP: [<c034559d>] skb_release_head_state+0x20/0xac
*pdpt = 000000003455c001 *pde = 0000000000000000
Oops: 0002 [#1] SMP
last sysfs file: /sys/devices/system/cpu/cpu3/topology/core_siblings
Modules linked in: ipv6 microcode fuse loop dm_mod ppdev rtc_cmos i2c_piix4
rtc_core i2c_core rtc_lib button sr_mod tg3 parport_pc sworks_agp cdrom floppy
parport agpgart pcspkr libphy sg ohci_hcd ehci_hcd sd_mod crc_t10dif usbcore
edd fan ide_pci_generic serverworks ide_core ata_generic pata_serverworks
libata ips scsi_mod thermal processor thermal_sys hwmon [last unloaded:
speedstep_lib]
Pid: 6, comm: ksoftirqd/1 Not tainted (2.6.31-rc9-autotest-next-20090907-5-pae
#1) eserver xSeries 235 -[86717AX]-
EIP: 0060:[<c034559d>] EFLAGS: 00010206 CPU: 1
EIP is at skb_release_head_state+0x20/0xac
EAX: 00000000 EBX: f44b5200 ECX: f44b5200 EDX: 00010090
ESI: f5548000 EDI: 00000000 EBP: f5c69dd4 ESP: f5c69dd0
DS: 007b ES: 007b FS: 00d8 GS: 0000 SS: 0068
Process ksoftirqd/1 (pid: 6, ti=f5c68000 task=f5c4f280 task.ti=f5c68000)
Stack:
f44b5200 f5c69de0 c0345398 f5c69e48 f5c69de8 c034542e f5c69e58 c0388807
<0> f44b5200 f5582900 ced1a038 c07ac124 ced1a030 3e6f7c09 eb152044 f4b4bc00
<0> 00000006 c05a594c f5c69e30 c036a2c0 c07ac124 f4b4bc00 f4b4bc00 eb152030
Call Trace:
[<c0345398>] ? __kfree_skb+0xb/0x71
[<c034542e>] ? consume_skb+0x30/0x32
[<c0388807>] ? arp_process+0x572/0x58e
[<c036a2c0>] ? ip_local_deliver_finish+0x143/0x207
[<c0388907>] ? arp_rcv+0xda/0xed
[<c034bdc2>] ? netif_receive_skb+0x43a/0x459
[<c034bee4>] ? napi_skb_finish+0x1e/0x33
[<c034c267>] ? napi_gro_receive+0x20/0x24
[<f8b3667f>] ? tg3_poll+0x5ed/0x802 [tg3]
[<c034c351>] ? net_rx_action+0x93/0x173
[<c013769c>] ? __do_softirq+0xa7/0x144
[<c013775f>] ? do_softirq+0x26/0x2b
[<c01377ae>] ? ksoftirqd+0x4a/0xae
[<c0137764>] ? ksoftirqd+0x0/0xae
[<c0146a2e>] ? kthread+0x61/0x66
[<c01469cd>] ? kthread+0x0/0x66
[<c0103507>] ? kernel_thread_helper+0x7/0x10
Code: fe ff ff 83 c4 0c 5b 5e 5f 5d c3 55 89 e5 53 89 c3 8b 40 18 85 c0 74 05
e8 22 ae 00 00 8b 53 1c c7 43 18 00 00 00 00 85 d2 74 11 <f0> ff 0a 0f 94 c0 84
c0 74 07 89 d0 e8 81 c6 05 00 83 7b 6c 00
EIP: [<c034559d>] skb_release_head_state+0x20/0xac SS:ESP 0068:f5c69dd0
CR2: 0000000000010090
---[ end trace 64c8710cf222dc04 ]---
At the time of crash, kernbench was running on this box.
The corresponding c code is :
0000000000002387 <skb_release_head_state>:
static void skb_release_head_state(struct sk_buff *skb)
{
2387: 55 push %rbp
2388: 48 89 e5 mov %rsp,%rbp
238b: 53 push %rbx
238c: 48 89 fb mov %rdi,%rbx
238f: 48 83 ec 08 sub $0x8,%rsp
skb_dst_drop():
/usr/local/autobench/var/tmp/build/linux/include/net/dst.h:179
}
...... <SNIP> ......
...... <SNIP> ......
skb_release_head_state():
/usr/local/autobench/var/tmp/build/linux/net/core/skbuff.c:395
skb_dst_drop(skb);
#ifdef CONFIG_XFRM
secpath_put(skb->sp);
23a1: 48 8b 7b 30 mov 0x30(%rbx),%rdi
skb_dst_drop():
/usr/local/autobench/var/tmp/build/linux/include/net/dst.h:181
skb->_skb_dst = 0UL;
23a5: 48 c7 43 28 00 00 00 movq $0x0,0x28(%rbx)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ This line
23ac: 00
Let me know what other information is required to debug this.
Thanks
-Sachin
--
---------------------------------
Sachin Sant
IBM Linux Technology Center
India Systems and Technology Labs
Bangalore, India
---------------------------------
^ permalink raw reply
* Re: Next Sept 7: Bug : skb_release_head_state on x86
From: Eric Dumazet @ 2009-09-07 17:17 UTC (permalink / raw)
To: Sachin Sant; +Cc: netdev, Stephen Rothwell, linux-next, David Miller
In-Reply-To: <4AA5399A.405@in.ibm.com>
Sachin Sant a écrit :
> Today's next kernel running on a x86 box crashed with
>
> BUG: unable to handle kernel paging request at 00010090
> IP: [<c034559d>] skb_release_head_state+0x20/0xac
> *pdpt = 000000003455c001 *pde = 0000000000000000
> Oops: 0002 [#1] SMP
> last sysfs file: /sys/devices/system/cpu/cpu3/topology/core_siblings
> Modules linked in: ipv6 microcode fuse loop dm_mod ppdev rtc_cmos i2c_piix4
> rtc_core i2c_core rtc_lib button sr_mod tg3 parport_pc sworks_agp cdrom
> floppy
> parport agpgart pcspkr libphy sg ohci_hcd ehci_hcd sd_mod crc_t10dif
> usbcore
> edd fan ide_pci_generic serverworks ide_core ata_generic pata_serverworks
> libata ips scsi_mod thermal processor thermal_sys hwmon [last unloaded:
> speedstep_lib]
>
> Pid: 6, comm: ksoftirqd/1 Not tainted
> (2.6.31-rc9-autotest-next-20090907-5-pae
> #1) eserver xSeries 235 -[86717AX]-
> EIP: 0060:[<c034559d>] EFLAGS: 00010206 CPU: 1
> EIP is at skb_release_head_state+0x20/0xac
> EAX: 00000000 EBX: f44b5200 ECX: f44b5200 EDX: 00010090
> ESI: f5548000 EDI: 00000000 EBP: f5c69dd4 ESP: f5c69dd0
> DS: 007b ES: 007b FS: 00d8 GS: 0000 SS: 0068
> Process ksoftirqd/1 (pid: 6, ti=f5c68000 task=f5c4f280 task.ti=f5c68000)
> Stack:
> f44b5200 f5c69de0 c0345398 f5c69e48 f5c69de8 c034542e f5c69e58 c0388807
> <0> f44b5200 f5582900 ced1a038 c07ac124 ced1a030 3e6f7c09 eb152044 f4b4bc00
> <0> 00000006 c05a594c f5c69e30 c036a2c0 c07ac124 f4b4bc00 f4b4bc00 eb152030
> Call Trace:
This is a crash on a 32bit kernel
> [<c0345398>] ? __kfree_skb+0xb/0x71
> [<c034542e>] ? consume_skb+0x30/0x32
> [<c0388807>] ? arp_process+0x572/0x58e
> [<c036a2c0>] ? ip_local_deliver_finish+0x143/0x207
> [<c0388907>] ? arp_rcv+0xda/0xed
> [<c034bdc2>] ? netif_receive_skb+0x43a/0x459
> [<c034bee4>] ? napi_skb_finish+0x1e/0x33
> [<c034c267>] ? napi_gro_receive+0x20/0x24
> [<f8b3667f>] ? tg3_poll+0x5ed/0x802 [tg3]
> [<c034c351>] ? net_rx_action+0x93/0x173
> [<c013769c>] ? __do_softirq+0xa7/0x144
> [<c013775f>] ? do_softirq+0x26/0x2b
> [<c01377ae>] ? ksoftirqd+0x4a/0xae
> [<c0137764>] ? ksoftirqd+0x0/0xae
> [<c0146a2e>] ? kthread+0x61/0x66
> [<c01469cd>] ? kthread+0x0/0x66
> [<c0103507>] ? kernel_thread_helper+0x7/0x10
> Code: fe ff ff 83 c4 0c 5b 5e 5f 5d c3 55 89 e5 53 89 c3 8b 40 18 85 c0
> 74 05
> e8 22 ae 00 00 8b 53 1c c7 43 18 00 00 00 00 85 d2 74 11 <f0> ff 0a 0f
> 94 c0 84
> c0 74 07 89 d0 e8 81 c6 05 00 83 7b 6c 00
> EIP: [<c034559d>] skb_release_head_state+0x20/0xac SS:ESP 0068:f5c69dd0
> CR2: 0000000000010090
> ---[ end trace 64c8710cf222dc04 ]---
>
> At the time of crash, kernbench was running on this box.
>
> The corresponding c code is :
> 0000000000002387 <skb_release_head_state>:
> static void skb_release_head_state(struct sk_buff *skb) {
and you decode a 64 bits kernel
> 2387: 55 push %rbp 2388: 48 89
> e5 mov %rsp,%rbp
> 238b: 53 push %rbx 238c: 48 89
> fb mov %rdi,%rbx
> 238f: 48 83 ec 08 sub $0x8,%rsp
> skb_dst_drop():
> /usr/local/autobench/var/tmp/build/linux/include/net/dst.h:179
> }
> ...... <SNIP> ......
> ...... <SNIP> ......
>
> skb_release_head_state():
> /usr/local/autobench/var/tmp/build/linux/net/core/skbuff.c:395
> skb_dst_drop(skb);
> #ifdef CONFIG_XFRM
> secpath_put(skb->sp);
> 23a1: 48 8b 7b 30 mov 0x30(%rbx),%rdi
> skb_dst_drop():
> /usr/local/autobench/var/tmp/build/linux/include/net/dst.h:181
> skb->_skb_dst = 0UL;
> 23a5: 48 c7 43 28 00 00 00 movq $0x0,0x28(%rbx)
> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ This line
> 23ac: 00
>
This is more probably
<f0> ff 0a lock decl (%edx)
part of :
secpath_put(skb->sp);
So some skb has a strange/buggy skb->sp (value 0x00010090)
It looks like skb->cb[xxx] overwrote skb->sp
Please check you have CONFIG_XFRM=y, and that you did rebuild all your modules after
patching your kernel...
^ permalink raw reply
* Re: linux-next: Tree for September 7 (scsi/qla2x)
From: Randy Dunlap @ 2009-09-07 17:27 UTC (permalink / raw)
To: Stephen Rothwell, linux-scsi; +Cc: linux-next, LKML, Andrew Vasquez
In-Reply-To: <20090907210206.7830ba68.sfr@canb.auug.org.au>
On Mon, 7 Sep 2009 21:02:06 +1000 Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20090904:
when CONFIG_MODULES=n:
drivers/scsi/qla2xxx/qla_os.c:2685: error: dereferencing pointer to incomplete type
in
kobject_uevent_env(&(&vha->hw->pdev->driver->driver)->owner->mkobj.kobj,
KOBJ_CHANGE, envp);
---
~Randy
LPC 2009, Sept. 23-25, Portland, Oregon
http://linuxplumbersconf.org/2009/
^ permalink raw reply
* Re: linux-next: manual merge of the tty tree with the tree
From: Linus Torvalds @ 2009-09-07 18:22 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Greg KH, linux-next, linux-kernel, Joe Peterson
In-Reply-To: <20090907191347.fe010955.sfr@canb.auug.org.au>
On Mon, 7 Sep 2009, Stephen Rothwell wrote:
>
> Today's linux-next merge of the tty tree got a conflict in
> drivers/char/n_tty.c between commit
> 37f81fa1f63ad38e16125526bb2769ae0ea8d332 ("n_tty: do O_ONLCR translation
> as a single write") from Linus' tree and commit
> bb2d17d83926bf9d70b922031aeb49ca896e0b3d ("tty: n_tty: honor opost flag
> for echoes") from the tty tree.
>
> I fixed it up (see below) and can carry the fix for a while.
Hmm. I think that the "honor opost flag for echoes" patch is actually
wrong.
We check O_OPOST() in the _caller_ for the regular write case, and that
test actually looks like this:
if (O_OPOST(tty) && !(test_bit(TTY_HW_COOK_OUT, &tty->flags))) {
so at a minimum, if we add it to process_output() we should likely add it
in the same format. But if we need that test, I'd rather do it in the
caller anyway, like we already do for regular writes.
So maybe the patch could be changed to something (UNTESTD!) like the
following instead? And thus avoid the conflict at the same time.
Linus
---
drivers/char/n_tty.c | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/drivers/char/n_tty.c b/drivers/char/n_tty.c
index 4e28b35..9c04bb4 100644
--- a/drivers/char/n_tty.c
+++ b/drivers/char/n_tty.c
@@ -345,6 +345,18 @@ static int do_output_char(unsigned char c, struct tty_struct *tty, int space)
return 1;
}
+static int output_echo(unsigned char c, struct tty_struct *tty, int space)
+{
+ if (O_OPOST(tty) && !(test_bit(TTY_HW_COOK_OUT, &tty->flags)))
+ return do_output_char(c, tty, space);
+
+ if (!space)
+ return -1;
+
+ tty_put_char(tty, c);
+ return 1;
+}
+
/**
* process_output - output post processor
* @c: character (or partial unicode symbol)
@@ -607,7 +619,7 @@ static void process_echoes(struct tty_struct *tty)
} else {
int retval;
- retval = do_output_char(c, tty, space);
+ retval = output_echo(c, tty, space);
if (retval < 0)
break;
space -= retval;
^ permalink raw reply related
* Re: linux-next: manual merge of the tty tree with the tree
From: Joe Peterson @ 2009-09-07 21:55 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Stephen Rothwell, Greg KH, linux-next, linux-kernel
In-Reply-To: <alpine.LFD.2.01.0909071104340.25628@localhost.localdomain>
[-- Attachment #1: Type: text/plain, Size: 1012 bytes --]
Linus Torvalds wrote:
> Hmm. I think that the "honor opost flag for echoes" patch is actually
> wrong.
>
> We check O_OPOST() in the _caller_ for the regular write case, and that
> test actually looks like this:
>
> if (O_OPOST(tty) && !(test_bit(TTY_HW_COOK_OUT, &tty->flags))) {
>
> so at a minimum, if we add it to process_output() we should likely add it
> in the same format. But if we need that test, I'd rather do it in the
> caller anyway, like we already do for regular writes.
Yes, very true. The old opost() function also contained the O_OPOST
check (i.e. causing a double check for normal writes), and you are right
that we should not reintroduce it (and it makes sense for the caller to
check it).
There is only the one case in which the O_OPOST check is needed before
calling do_output_char() (in process_echoes()), so we could just inline
the test there. Take a look at my new attached patch (untested also).
I'll test and resubmit, assuming there are no objections.
-Thanks, Joe
[-- Attachment #2: n_tty-honor-opost-flag-for-echoes.patch --]
[-- Type: text/plain, Size: 2102 bytes --]
--- n_tty.c.orig 2009-09-07 13:54:32.460678337 -0600
+++ n_tty.c 2009-09-07 15:48:51.191033405 -0600
@@ -272,7 +272,8 @@ static inline int is_continuation(unsign
*
* This is a helper function that handles one output character
* (including special characters like TAB, CR, LF, etc.),
- * putting the results in the tty driver's write buffer.
+ * doing OPOST processing and putting the results in the
+ * tty driver's write buffer.
*
* Note that Linux currently ignores TABDLY, CRDLY, VTDLY, FFDLY
* and NLDLY. They simply aren't relevant in the world today.
@@ -351,8 +352,9 @@ static int do_output_char(unsigned char
* @c: character (or partial unicode symbol)
* @tty: terminal device
*
- * Perform OPOST processing. Returns -1 when the output device is
- * full and the character must be retried.
+ * Output one character with OPOST processing.
+ * Returns -1 when the output device is full and the character
+ * must be retried.
*
* Locking: output_lock to protect column state and space left
* (also, this is called from n_tty_write under the
@@ -378,8 +380,11 @@ static int process_output(unsigned char
/**
* process_output_block - block post processor
* @tty: terminal device
- * @inbuf: user buffer
- * @nr: number of bytes
+ * @buf: character buffer
+ * @nr: number of bytes to output
+ *
+ * Output a block of characters with OPOST processing.
+ * Returns the number of characters output.
*
* This path is used to speed up block console writes, among other
* things when processing blocks of output data. It handles only
@@ -606,12 +611,18 @@ static void process_echoes(struct tty_st
if (no_space_left)
break;
} else {
- int retval;
-
- retval = do_output_char(c, tty, space);
- if (retval < 0)
- break;
- space -= retval;
+ if (O_OPOST(tty) &&
+ !(test_bit(TTY_HW_COOK_OUT, &tty->flags))) {
+ int retval = do_output_char(c, tty, space);
+ if (retval < 0)
+ break;
+ space -= retval;
+ } else {
+ if (!space)
+ break;
+ tty_put_char(tty, c);
+ space -= 1;
+ }
cp += 1;
nr -= 1;
}
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox