CHOON.NET Forums

[PATCH] drivers/staging/line6/config.h: Delete unused header (no replies)

Johannes Thumshirn — Fri, 18 May 2012 22:53:06 +0800

Delete unused header file drivers/staging/line6/config.h

Signed-off-by: Johannes Thumshirn
---
drivers/staging/line6/config.h | 43 ----------------------------------------
1 files changed, 0 insertions(+), 43 deletions(-)
delete mode 100644 drivers/staging/line6/config.h

diff --git a/drivers/staging/line6/config.h b/drivers/staging/line6/config.h
deleted file mode 100644
index 2493491..0000000
--- a/drivers/staging/line6/config.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Line6 Linux USB driver - 0.8.0
- *
- * Copyright (C) 2004-2009 Markus Grabner (grabner@icg.tugraz.at)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, version 2.
- *
- */
-
-#ifndef CONFIG_H
-#define CONFIG_H
-
-
-#ifdef CONFIG_USB_DEBUG
-#define DEBUG 1
-#endif
-
-
-/*
- * Development tools.
- */
-#define DO_DEBUG_MESSAGES 0
-#define DO_DUMP_URB_SEND DO_DEBUG_MESSAGES
-#define DO_DUMP_URB_RECEIVE DO_DEBUG_MESSAGES
-#define DO_DUMP_PCM_SEND 0
-#define DO_DUMP_PCM_RECEIVE 0
-#define DO_DUMP_MIDI_SEND DO_DEBUG_MESSAGES
-#define DO_DUMP_MIDI_RECEIVE DO_DEBUG_MESSAGES
-#define DO_DUMP_ANY (DO_DUMP_URB_SEND || DO_DUMP_URB_RECEIVE || \
- DO_DUMP_PCM_SEND || DO_DUMP_PCM_RECEIVE || \
- DO_DUMP_MIDI_SEND || DO_DUMP_MIDI_RECEIVE)
-#define CREATE_RAW_FILE 0
-
-#if DO_DEBUG_MESSAGES
-#define DEBUG_MESSAGES(x) (x)
-#else
-#define DEBUG_MESSAGES(x)
-#endif
-
-
-#endif
--
1.7.7.6

--
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 [vger.kernel.org]
Please read the FAQ at [www.tux.org]

[Xen-devel] [PATCH v6 0/11] qdisk local attach (22 replies)

Stefano Stabellini — Fri, 18 May 2012 22:50:09 +0800

Hi all,
this patch implements local_attach support for QDISK: that means that
you can use qcow2 as disk format for your PV guests disks and use
pygrub to retrieve the kernel and initrd in dom0.

The idea is that we start a QEMU instance at boot time to listen to
local_attach requests. When libxl_device_disk_local_attach is called on
a QDISK images, libxl sets up a backend/frontend pair in dom0 for the disk
so that blkfront in dom0 will create a new xvd device for it.
Then pygrub can be pointed at this device to retrieve kernel and
initrd.

Changes in v6:
- rebase on "nstore: rename public xenstore headers";
- new patch: "libxl_string_to_backend: add qdisk";
- new patch: "main_blockdetach: destroy the disk on successful removal";
- split "libxl: introduce libxl__device_disk_add" in two patches;
- return error in case pdev_path is NULL;
- libxl__device_disk_local_attach update the new disk, the caller
allocates it;
- remove \n from logs;
- document blkdev_start;
- use libxl__strdup to allocate blkdev_start;
- more comments in libxl__devid_to_localdev;
- inline GCSPRINTF;
- introduce ret for xs_* error codes.

Changes in v5:
- remove _hidden from the libxl_device_disk_local_attach/detach
implementation;
- libxl__device_disk_local_attach: rename disk to in_disk;
- libxl__device_disk_local_attach: rename tmpdisk to disk;
- libxl__device_disk_local_attach: copy disk to new_disk only on success;
- libxl__device_disk_local_attach: remove check on libxl__zalloc success.
- rename libxl__device_generic_add_t to libxl__device_generic_add;
- change the type of the blkdev_start parameter to
libxl__device_disk_local_attach to const char *;
- remove domid paramter to libxl__alloc_vdev (assume
LIBXL_TOOLSTACK_DOMID);
- remove scaling limit from libxl__alloc_vdev;
- libxl__device_disk_local_attach: replace LIBXL__LOG with LOG;
- libxl__device_disk_local_attach: unify error paths.

Changes in v4:
- split the first patch into 2 patches: the first is a simple move, the
second one adds a new parameter;
- libxl__device_generic_add: do not end the transaction is the caller
provided it;
- libxl__device_generic_add: fix success exit path;
- pass blkdev_start in libxl_domain_build_info;
- rename libxl__devid_to_vdev to libxl__devid_to_localdev;
- introduce upper bound for encode_disk_name;
- improve error handling and exit paths in libxl__alloc_vdev and
libxl__device_disk_local_attach.

Changes in v3:
- libxl__device_disk_local_attach: wait for the backend to be
"connected" before returning.

Changes in v2:
- make libxl_device_disk_local_(de)attach internal functions;
- allocate the new disk in libxl_device_disk_local_attatch on the GC;
- remove libxl__device_generic_add_t, add a transaction parameter to
libxl__device_generic_add instead;
- add a new patch to introduce a blkdev_start option to xl.conf;
- reimplement libxl__alloc_vdev checking for the frontend path and
starting from blkdev_start;
- introduce a Linux specific libxl__devid_to_vdev function based on last
Jan's patch to blkfront.

Stefano Stabellini (11):
libxl: make libxl_device_disk_local_attach/detach internal functions
libxl: libxl__device_disk_local_attach return a new libxl_device_disk
libxl: add a transaction parameter to libxl__device_generic_add
libxl: move libxl__device_from_disk to libxl_internal.c
libxl: introduce libxl__device_disk_add
xl/libxl: add a blkdev_start parameter
libxl: introduce libxl__alloc_vdev
xl/libxl: implement QDISK libxl_device_disk_local_attach
libxl__device_disk_local_attach: wait for state "connected"
libxl_string_to_backend: add qdisk
main_blockdetach: destroy the disk on successful removal

docs/man/xl.conf.pod.5 | 6 +
tools/examples/xl.conf | 3 +
tools/hotplug/Linux/init.d/sysconfig.xencommons | 3 +
tools/hotplug/Linux/init.d/xencommons | 3 +
tools/libxl/libxl.c | 238 +----------------
tools/libxl/libxl.h | 7 -
tools/libxl/libxl_bootloader.c | 7 +-
tools/libxl/libxl_create.c | 3 +
tools/libxl/libxl_device.c | 17 +-
tools/libxl/libxl_internal.c | 325 +++++++++++++++++++++++
tools/libxl/libxl_internal.h | 26 ++-
tools/libxl/libxl_linux.c | 48 ++++
tools/libxl/libxl_netbsd.c | 6 +
tools/libxl/libxl_pci.c | 2 +-
tools/libxl/libxl_types.idl | 1 +
tools/libxl/libxl_utils.c | 2 +
tools/libxl/xl.c | 3 +
tools/libxl/xl.h | 1 +
tools/libxl/xl_cmdimpl.c | 5 +-
19 files changed, 454 insertions(+), 252 deletions(-)

Cheers,

Stefano

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
[lists.xen.org]

[PATCH RFC V2 0/6] Fix leap seconds and add tai clock (6 replies)

Richard Cochran — Fri, 18 May 2012 22:13:30 +0800

In honor of this summer's new leap second, this patch series aim to
fix the incorrect time values reported during a leap second. This
second version of the patch series does not change the core time
keeping code, but rather affects only the adjtimex interface.

Of course, the POSIX UTC system is broken by design, and the Linux
kernel cannot fix that. However, what we can do is correctly execute
leap seconds and report the time variables (UTC time, TAI offset, and
leap second status) with consistency.

Since commit 6b43ae8a, the leap second is applied on the first timer
tick after the actual deadline, resulting in incorrect time values
from gettimeofday and friends. In contrast to V1, this series does
not address that issue but rather adds extra checks into the adjtimex
code path, with the effect of always providing correct UTC time
values, even during a leap second.

The first two patches merely clean up some cruft I noticed along the
way while working on this series.

John Stultz (1):
time: Add CLOCK_TAI clockid

Richard Cochran (5):
time: remove obsolete declaration
ntp: remove useless parameter
time: keep track of the pending utc/tai threshold
time: introduce leap second functional interface
time: move leap second management into time keeping core

include/linux/time.h | 9 +-
kernel/posix-timers.c | 10 ++
kernel/time/leap-seconds.h | 21 ++++
kernel/time/ntp.c | 90 ++++++------------
kernel/time/timekeeping.c | 228 ++++++++++++++++++++++++++++++++++++++++++--
5 files changed, 283 insertions(+), 75 deletions(-)
create mode 100644 kernel/time/leap-seconds.h

--
1.7.2.5

--
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 [vger.kernel.org]
Please read the FAQ at [www.tux.org]

[patch] [SCSI] scsi_pm: passing wrong pointer to resume() (no replies)

Dan Carpenter — Fri, 18 May 2012 22:09:02 +0800

This gets caught by GCC:
drivers/scsi/scsi_pm.c:30:5: warning: passing argument 1 of
‘scsi_device_resume’ from incompatible pointer type
[enabled by default]

It probably would have been caught in testing as well, but it's on an
error path.

Signed-off-by: Dan Carpenter
---
I haven't tested this. :/ Sorry for that.

diff --git a/drivers/scsi/scsi_pm.c b/drivers/scsi/scsi_pm.c
index 9bd2c41..d4201de 100644
--- a/drivers/scsi/scsi_pm.c
+++ b/drivers/scsi/scsi_pm.c
@@ -27,7 +27,7 @@ static int scsi_dev_type_suspend(struct device *dev, pm_message_t msg)
if (drv && drv->suspend) {
err = drv->suspend(dev, msg);
if (err)
- scsi_device_resume(dev);
+ scsi_device_resume(to_scsi_device(dev));
}
}
dev_dbg(dev, "scsi suspend: %d\n", err);
--
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 [vger.kernel.org]
Please read the FAQ at [www.tux.org]

[PATCH 1/1] rc-loopback: remove duplicate line (no replies)

Michel Machado — Fri, 18 May 2012 21:51:02 +0800

This patch just removes the second assignment "rc->priv = &loopdev;"
that happens a fews lines after the first one.

Signed-off-by: Michel Machado
CC: Mauro Carvalho Chehab
CC: "David Härdeman"
---

diff --git a/drivers/media/rc/rc-loopback.c b/drivers/media/rc/rc-loopback.c
index efc6a51..fae1615 100644
--- a/drivers/media/rc/rc-loopback.c
+++ b/drivers/media/rc/rc-loopback.c
@@ -221,7 +221,6 @@ static int __init loop_init(void)
rc->s_idle = loop_set_idle;
rc->s_learning_mode = loop_set_learning_mode;
rc->s_carrier_report = loop_set_carrier_report;
- rc->priv = &loopdev;

loopdev.txmask = RXMASK_REGULAR;
loopdev.txcarrier = 36000;

--
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 [vger.kernel.org]
Please read the FAQ at [www.tux.org]

[PATCH v3] UBI: add lnum and vol_id to struct ubi_work (1 reply)

Joel Reardon — Fri, 18 May 2012 22:18:08 +0800

This is part of a multipart patch to allow UBI to force the erasure of
particular logical eraseblock numbers. In this patch, the volume id and LEB
number are added to ubi_work data structure, and both are also passed as a
parameter to schedule erase to set it appropriately. Whenever ubi_wl_put_peb
is called, the lnum is also passed to be forwarded to schedule erase. Later,
a new ubi_sync_lnum will be added to execute immediately all work related to
that lnum.

This was tested by outputting the vol_id and lnum during the schedule of
erasure. The ubi thread was disabled and two ubifs drives on separate
partitions repeated changed a small number of LEBs. The ubi module was readded, and all
the erased LEBs, corresponding to the volumes, were added to the schedule
erase queue.

Signed-off-by: Joel Reardon
---
drivers/mtd/ubi/eba.c | 16 ++++++++--------
drivers/mtd/ubi/ubi.h | 3 ++-
drivers/mtd/ubi/wl.c | 32 +++++++++++++++++++++++---------
3 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/drivers/mtd/ubi/eba.c b/drivers/mtd/ubi/eba.c
index bd5fdbf..4421540 100644
--- a/drivers/mtd/ubi/eba.c
+++ b/drivers/mtd/ubi/eba.c
@@ -341,7 +341,7 @@ int ubi_eba_unmap_leb(struct ubi_device *ubi, struct ubi_volume *vol,
dbg_eba("erase LEB %d:%d, PEB %d", vol_id, lnum, pnum);

vol->eba_tbl[lnum] = UBI_LEB_UNMAPPED;
- err = ubi_wl_put_peb(ubi, pnum, 0);
+ err = ubi_wl_put_peb(ubi, vol_id, lnum, pnum, 0);

out_unlock:
leb_write_unlock(ubi, vol_id, lnum);
@@ -550,7 +550,7 @@ retry:
ubi_free_vid_hdr(ubi, vid_hdr);

vol->eba_tbl[lnum] = new_pnum;
- ubi_wl_put_peb(ubi, pnum, 1);
+ ubi_wl_put_peb(ubi, vol_id, lnum, pnum, 1);

ubi_msg("data was successfully recovered");
return 0;
@@ -558,7 +558,7 @@ retry:
out_unlock:
mutex_unlock(&ubi->buf_mutex);
out_put:
- ubi_wl_put_peb(ubi, new_pnum, 1);
+ ubi_wl_put_peb(ubi, vol_id, lnum, new_pnum, 1);
ubi_free_vid_hdr(ubi, vid_hdr);
return err;

@@ -568,7 +568,7 @@ write_error:
* get another one.
*/
ubi_warn("failed to write to PEB %d", new_pnum);
- ubi_wl_put_peb(ubi, new_pnum, 1);
+ ubi_wl_put_peb(ubi, vol_id, lnum, new_pnum, 1);
if (++tries > UBI_IO_RETRIES) {
ubi_free_vid_hdr(ubi, vid_hdr);
return err;
@@ -686,7 +686,7 @@ write_error:
* eraseblock, so just put it and request a new one. We assume that if
* this physical eraseblock went bad, the erase code will handle that.
*/
- err = ubi_wl_put_peb(ubi, pnum, 1);
+ err = ubi_wl_put_peb(ubi, vol_id, lnum, pnum, 1);
if (err || ++tries > UBI_IO_RETRIES) {
ubi_ro_mode(ubi);
leb_write_unlock(ubi, vol_id, lnum);
@@ -804,7 +804,7 @@ write_error:
return err;
}

- err = ubi_wl_put_peb(ubi, pnum, 1);
+ err = ubi_wl_put_peb(ubi, vol_id, lnum, pnum, 1);
if (err || ++tries > UBI_IO_RETRIES) {
ubi_ro_mode(ubi);
leb_write_unlock(ubi, vol_id, lnum);
@@ -901,7 +901,7 @@ retry:
}

if (vol->eba_tbl[lnum] >= 0) {
- err = ubi_wl_put_peb(ubi, vol->eba_tbl[lnum], 0);
+ err = ubi_wl_put_peb(ubi, vol_id, lnum, vol->eba_tbl[lnum], 0);
if (err)
goto out_leb_unlock;
}
@@ -926,7 +926,7 @@ write_error:
goto out_leb_unlock;
}

- err = ubi_wl_put_peb(ubi, pnum, 1);
+ err = ubi_wl_put_peb(ubi, vol_id, lnum, pnum, 1);
if (err || ++tries > UBI_IO_RETRIES) {
ubi_ro_mode(ubi);
goto out_leb_unlock;
diff --git a/drivers/mtd/ubi/ubi.h b/drivers/mtd/ubi/ubi.h
index 75b9f1c..05aa452 100644
--- a/drivers/mtd/ubi/ubi.h
+++ b/drivers/mtd/ubi/ubi.h
@@ -533,7 +533,8 @@ int ubi_eba_init_scan(struct ubi_device *ubi, struct ubi_scan_info *si);

/* wl.c */
int ubi_wl_get_peb(struct ubi_device *ubi);
-int ubi_wl_put_peb(struct ubi_device *ubi, int pnum, int torture);
+int ubi_wl_put_peb(struct ubi_device *ubi, int vol_id, int lnum,
+ int pnum, int torture);
int ubi_wl_flush(struct ubi_device *ubi);
int ubi_wl_scrub_peb(struct ubi_device *ubi, int pnum);
int ubi_wl_init_scan(struct ubi_device *ubi, struct ubi_scan_info *si);
diff --git a/drivers/mtd/ubi/wl.c b/drivers/mtd/ubi/wl.c
index 64ce993..39bdc3b 100644
--- a/drivers/mtd/ubi/wl.c
+++ b/drivers/mtd/ubi/wl.c
@@ -140,6 +140,8 @@
* @list: a link in the list of pending works
* @func: worker function
* @e: physical eraseblock to erase
+ * @vol_id: the volume ID on which this erasure is being performed
+ * @lnum: the logical number of the erase block
* @torture: if the physical eraseblock has to be tortured
*
* The @func pointer points to the worker function. If the @cancel argument is
@@ -152,6 +154,8 @@ struct ubi_work {
int (*func)(struct ubi_device *ubi, struct ubi_work *wrk, int cancel);
/* The below fields are only relevant to erasure works */
struct ubi_wl_entry *e;
+ int vol_id;
+ int lnum;
int torture;
};

@@ -586,13 +590,15 @@ static int erase_worker(struct ubi_device *ubi, struct ubi_work *wl_wrk,
* schedule_erase - schedule an erase work.
* @ubi: UBI device description object
* @e: the WL entry of the physical eraseblock to erase
+ * @vol_id: the volume ID that last used the eraseblock
+ * @lnum: the last used logical block number for the eraseblock
* @torture: if the physical eraseblock has to be tortured
*
* This function returns zero in case of success and a %-ENOMEM in case of
* failure.
*/
static int schedule_erase(struct ubi_device *ubi, struct ubi_wl_entry *e,
- int torture)
+ int vol_id, int lnum, int torture)
{
struct ubi_work *wl_wrk;

@@ -605,6 +611,8 @@ static int schedule_erase(struct ubi_device *ubi, struct ubi_wl_entry *e,

wl_wrk->func = &erase_worker;
wl_wrk->e = e;
+ wl_wrk->vol_id = vol_id;
+ wl_wrk->lnum = lnum;
wl_wrk->torture = torture;

schedule_ubi_work(ubi, wl_wrk);
@@ -805,7 +813,7 @@ static int wear_leveling_worker(struct ubi_device *ubi, struct ubi_work *wrk,
ubi->move_to_put = ubi->wl_scheduled = 0;
spin_unlock(&ubi->wl_lock);

- err = schedule_erase(ubi, e1, 0);
+ err = schedule_erase(ubi, e1, vol_id, lnum, 0);
if (err) {
kmem_cache_free(ubi_wl_entry_slab, e1);
if (e2)
@@ -820,7 +828,7 @@ static int wear_leveling_worker(struct ubi_device *ubi, struct ubi_work *wrk,
*/
dbg_wl("PEB %d (LEB %d:%d) was put meanwhile, erase",
e2->pnum, vol_id, lnum);
- err = schedule_erase(ubi, e2, 0);
+ err = schedule_erase(ubi, e2, vol_id, lnum, 0);
if (err) {
kmem_cache_free(ubi_wl_entry_slab, e2);
goto out_ro;
@@ -859,7 +867,7 @@ out_not_moved:
spin_unlock(&ubi->wl_lock);

ubi_free_vid_hdr(ubi, vid_hdr);
- err = schedule_erase(ubi, e2, torture);
+ err = schedule_erase(ubi, e2, vol_id, lnum, torture);
if (err) {
kmem_cache_free(ubi_wl_entry_slab, e2);
goto out_ro;
@@ -978,6 +986,8 @@ static int erase_worker(struct ubi_device *ubi, struct ubi_work *wl_wrk,
{
struct ubi_wl_entry *e = wl_wrk->e;
int pnum = e->pnum, err, need;
+ int vol_id = wl_wrk->vol_id;
+ int lnum = wl_wrk->lnum;

if (cancel) {
dbg_wl("cancel erasure of PEB %d EC %d", pnum, e->ec);
@@ -986,7 +996,8 @@ static int erase_worker(struct ubi_device *ubi, struct ubi_work *wl_wrk,
return 0;
}

- dbg_wl("erase PEB %d EC %d", pnum, e->ec);
+ dbg_wl("erase PEB %d EC %d volume %d LEB %d",
+ pnum, e->ec, wl_wrk->vol_id, wl_wrk->lnum);

err = sync_erase(ubi, e, wl_wrk->torture);
if (!err) {
@@ -1016,7 +1027,7 @@ static int erase_worker(struct ubi_device *ubi, struct ubi_work *wl_wrk,
int err1;

/* Re-schedule the LEB for erasure */
- err1 = schedule_erase(ubi, e, 0);
+ err1 = schedule_erase(ubi, e, vol_id, lnum, 0);
if (err1) {
err = err1;
goto out_ro;
@@ -1084,6 +1095,8 @@ out_ro:
/**
* ubi_wl_put_peb - return a PEB to the wear-leveling sub-system.
* @ubi: UBI device description object
+ * @vol_id: the volume ID that last used the eraseblock
+ * @lnum: the last used logical eraseblock number for the PEB
* @pnum: physical eraseblock to return
* @torture: if this physical eraseblock has to be tortured
*
@@ -1092,7 +1105,8 @@ out_ro:
* occurred to this @pnum and it has to be tested. This function returns zero
* in case of success, and a negative error code in case of failure.
*/
-int ubi_wl_put_peb(struct ubi_device *ubi, int pnum, int torture)
+int ubi_wl_put_peb(struct ubi_device *ubi, int vol_id, int lnum,
+ int pnum, int torture)
{
int err;
struct ubi_wl_entry *e;
@@ -1158,7 +1172,7 @@ retry:
}
spin_unlock(&ubi->wl_lock);

- err = schedule_erase(ubi, e, torture);
+ err = schedule_erase(ubi, e, vol_id, lnum, torture);
if (err) {
spin_lock(&ubi->wl_lock);
wl_tree_add(e, &ubi->used);
@@ -1423,7 +1437,7 @@ int ubi_wl_init_scan(struct ubi_device *ubi, struct ubi_scan_info *si)
e->pnum = seb->pnum;
e->ec = seb->ec;
ubi->lookuptbl[e->pnum] = e;
- if (schedule_erase(ubi, e, 0)) {
+ if (schedule_erase(ubi, e, seb->vol_id, seb->lnum, 0)) {
kmem_cache_free(ubi_wl_entry_slab, e);
goto out_free;
}
--
1.7.5.4

--
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 [vger.kernel.org]
Please read the FAQ at [www.tux.org]

[Full-disclosure] H2HC Brazil 9th Edition - Call for Papers (no replies)

Rodrigo Rubira Branco (BSDaemon) — Fri, 18 May 2012 21:35:03 +0800

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

CALL FOR PAPERS - Hackers 2 Hackers Conference 9th edition

The call for papers for H2HC 9th edition is now open. H2HC is a hacker
conference taking place in Sao Paulo, Brazil, from 18 to 23 October 2012.

[ - Introduction - ]

For the ninth consecutive year and past success we have been having,
the annual Hackers 2 Hackers Conference will be held again in Sao Paulo,
from 18 to 23 October 2012 and aims to get together industry,
government, academia and underground hackers to share knowledge and
leading-edge ideas about information security and everything related
to it.

H2HC will feature national and international speakers and attendees with
a wide range of skills. The atmosphere is favorable to present all
facets of computer security subject and will be a great opportunity to
network with like-minded people and enthusiasts.

The conference is a dual-language conference, with ALL talks in
English or simultaneously translated to English by professional
linguists with experience in computer sciences translation.

[ - The venue - ]

H2HC 9th edition will take place at Espaco Apas
(http://www.espacoapas.com.br/default.asp?resolucao=1920X1200) in an
auditorium with capacity for up to 600 people. Additionally, we will
be helding BSides SP on October, 20 in an auditorium in the same
venue with capacity for up to 200 people.

[*] About Sao Paulo (taken from fiquemaisumdia.com.br)

The city is the largest in Brazil and first in South America by
population. Quite often Sao Paulo intimidates people because of its
size, its constant pedestrian and vehicle traffic, ethnic and cultural
multiplicity. Sao Paulo will surprise you wheter you come here on
business or for an expo, a congress or a convenion, stay for at least
one more day. Let yourself be seduced by the cultural diversity of
this many-faceted city which vibrates, dictates fashion, is always
anticipating trends, and welcomes Brazilians and foreigners from all
over. And oh, do not forget to have fun in South America's wildest night
life.

[ - Topics - ]

H2HC committee gives preference to lectures with practical
demonstration. The conference staff will try to provide every equipment
needed for the presentation in the case the author cannot provide them.

The following topics include, but are not limited to:

* Exploit development techniques
* Telecom security and phone phreaking
* Fuzzing and application security test
* Penetration testing
* Web application security
* Techniques for development of secure software and systems
* Hardware hacking, embedded systems and other electronic devices
* Mobile devices exploitation, Symbian, P2K and bluetooth technologies
* Analysis of virus, worms and all sorts of malwares
* Reverse engineering
* Rootkits
* Security in Wi-Fi and VoIP environments
* Information about smartcard and RFID security and similars
* Technical approach to alternative operating systems
* Denial of service attacks and/or countermeasures
* Security aspects in SCADA and industrial environments and
"obscure" networks
* Cryptography
* Lockpicking, trashing, physical security and urban exploration
* Internet, privacy and Big Brother
* Information warfare and industrial espionage

[ - Important dates - ]

Conference and trainings - H2HC Sao Paulo/Brazil

October 18th and 19th: H2HC trainings 1
October 20th and 21th: H2HC 9th edition
October 22th and 23th: H2HC trainings 2

Deadline and submissions

Deadline for proposal submissions: July 17 2012
Deadline for slides submissions: August 17 2012

Notification of acceptance or rejection: no later than August 10 2012

* E-mail for proposal submissions:
rodrigo *noSPAM* kernelhacking *dot* com *

Make sure to provide along with your submission the following details:

* Speaker name or handle, address, e-mail, phone number and general
contact information
* A brief but informative description about your talk
* Short biography of the presenter, including organization, company
and affiliations
* Estimated time-length of presentation
* General topic of the speech (eg.: network security, secure
programming, computer forensics, etc.)
* Any other technical requirements for your lecture
* Whether you need visa to enter Brazil or not

Speakers will be allocated 50 minutes of presentation time, although, if
needed, we can extend the presentation length if requested in advance.

Preferable file format for papers and slides are both PDF and also PPT
for slides.

Speakers are asked to hand in slides used in their lectures.

PLEASE NOTE: Bear in mind no sales pitches will be allowed. If your
presentation involves advertisement of products or services please do
not submit.

[ - Information for speakers - ]

Speakers' privileges are:

* H2HC staff can guarantee and we will provide accommodation for 2
nights
* For each non-resident speaker we might be able to cover travel
expenses up to USD 1.000
* For each resident speaker we might be able to cover travel expenses
* Free pass to the conference
* Parties! Plenty of parties... Hope you enjoy it, otherwise you can
stay in the hotel, sleep and regret!...

[ - Other information - ]

For further information please check out our web site
[www.h2hc.com.br] it will be updated with everything regarding
the conference.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
Comment: GPGTools - [gpgtools.org]
Comment: Using GnuPG with Mozilla - [enigmail.mozdev.org]

iEYEARECAAYFAk+2UDoACgkQRpuC3B/O3qFxkwCffUblSjG4QJRL1DGfexcOi9Qq
KuEAnj2vF4Ti1zGIqC0ZP/e75oFgwA5Y
=PuSf
-----END PGP SIGNATURE-----

_______________________________________________
Full-Disclosure - We believe in it.
Charter: [lists.grok.org.uk]
Hosted and sponsored by Secunia - [secunia.com]

[PATCH] cpuidle: (POWER) Replace pseries_notify_cpuidle_add call with a elegant notifier to fix lockdep problem in start_secondary (no replies)

Deepthi Dharwar — Fri, 18 May 2012 21:30:04 +0800

The following patch is to remove the pseries_notify_add_cpu() call
and replace it by a hot plug notifier.
This would prevent cpuidle resources being
released and allocated each time cpu comes online on pseries.
The earlier design was causing a lockdep problem
in start_secondary as reported on this thread
-[lkml.org]

This applies on 3.4-rc7

Signed-off-by: Deepthi Dharwar
---
arch/powerpc/include/asm/processor.h | 2 --
arch/powerpc/platforms/pseries/processor_idle.c | 25
+++++++++++++++++------
arch/powerpc/platforms/pseries/smp.c | 1 -
3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/arch/powerpc/include/asm/processor.h
b/arch/powerpc/include/asm/processor.h
index 8e2d037..c6bc22b 100644
--- a/arch/powerpc/include/asm/processor.h
+++ b/arch/powerpc/include/asm/processor.h
@@ -390,10 +390,8 @@ void cpu_idle_wait(void);

#ifdef CONFIG_PSERIES_IDLE
extern void update_smt_snooze_delay(int snooze);
-extern int pseries_notify_cpuidle_add_cpu(int cpu);
#else
static inline void update_smt_snooze_delay(int snooze) {}
-static inline int pseries_notify_cpuidle_add_cpu(int cpu) { return 0; }
#endif

extern void flush_instruction_cache(void);
diff --git a/arch/powerpc/platforms/pseries/processor_idle.c
b/arch/powerpc/platforms/pseries/processor_idle.c
index 41a34bc..d1a7dc0 100644
--- a/arch/powerpc/platforms/pseries/processor_idle.c
+++ b/arch/powerpc/platforms/pseries/processor_idle.c
@@ -11,6 +11,7 @@
#include
#include
#include
+#include

#include
#include
@@ -186,17 +187,28 @@ static struct cpuidle_state
shared_states[MAX_IDLE_STATE_COUNT] = {
.enter = &shared_cede_loop },
};

-int pseries_notify_cpuidle_add_cpu(int cpu)
+static int pseries_cpuidle_add_cpu_notifier(struct notifier_block *n,
+ unsigned long action, void *hcpu)
{
+ int hotcpu = (unsigned long)hcpu;
struct cpuidle_device *dev =
- per_cpu_ptr(pseries_cpuidle_devices, cpu);
- if (dev && cpuidle_get_driver()) {
- cpuidle_disable_device(dev);
- cpuidle_enable_device(dev);
+ per_cpu_ptr(pseries_cpuidle_devices, hotcpu);
+
+ switch (action & 0xf) {
+ case CPU_ONLINE:
+ if (dev && cpuidle_get_driver()) {
+ cpuidle_disable_device(dev);
+ cpuidle_enable_device(dev);
+ }
+ break;
}
- return 0;
+ return NOTIFY_OK;
}

+static struct notifier_block setup_hotplug_notifier = {
+ .notifier_call = pseries_cpuidle_add_cpu_notifier,
+};
+
/*
* pseries_cpuidle_driver_init()
*/
@@ -321,6 +333,7 @@ static int __init pseries_processor_idle_init(void)
return retval;
}

+ register_cpu_notifier(&setup_hotplug_notifier);
printk(KERN_DEBUG "pseries_idle_driver registered\n");

return 0;
diff --git a/arch/powerpc/platforms/pseries/smp.c
b/arch/powerpc/platforms/pseries/smp.c
index e16bb8d..71706bc 100644
--- a/arch/powerpc/platforms/pseries/smp.c
+++ b/arch/powerpc/platforms/pseries/smp.c
@@ -147,7 +147,6 @@ static void __devinit smp_xics_setup_cpu(int cpu)
set_cpu_current_state(cpu, CPU_STATE_ONLINE);
set_default_offline_state(cpu);
#endif
- pseries_notify_cpuidle_add_cpu(cpu);
}

static int __devinit smp_pSeries_kick_cpu(int nr)

--
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 [vger.kernel.org]
Please read the FAQ at [www.tux.org]

[GIT] floppy (1 reply)

Jiri Kosina — Fri, 18 May 2012 22:21:11 +0800

Jens,

please pull from

git://git.kernel.org/pub/scm/linux/kernel/git/jikos/floppy.git upstream

to receive 3 patches for the floppy driver. The first one fixes a number
of races, which never exposed themselves on real floppy hardware, but are
triggering a lot on virtualized/emulated floppy drives. The second one
makes handling of O_EXCL on /dev/fd0 more consistent with other block
devices (and actually fixes a userspace-visible regression). The third one
adds myself as an unhappy maintainer, as discussed here:
[lkml.org]

The 'upstream' branch is based on your 'for-3.5/drivers' branch.

Thanks!

Jiri Kosina (3):
floppy: convert to delayed work and single-thread wq
floppy: remove floppy-specific O_EXCL handling
floppy: take over maintainership

MAINTAINERS | 6 ++
drivers/block/floppy.c | 161 +++++++++++++++++++++++-------------------------
2 files changed, 83 insertions(+), 84 deletions(-)

--
Jiri Kosina
SUSE Labs
--
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 [vger.kernel.org]
Please read the FAQ at [www.tux.org]

BFS 420: fix ttwu stat (1 reply)

Hillf Danton — Fri, 18 May 2012 21:56:07 +0800

Due to monolithic runqueue used by BFS, the ttwu stat is bogus as we could not
tell/predict on which CPU a woken task will run after it is activated. And we
have to delay updating ttwu stat until the stage when task is taken off run
queue. To achieve that, a field, wakeup_cpu, is added in the task struct, and is
inited to be invalid CPU number for each new task.

When updating ttwu stat, now it is simply to mark the delayed operation; and
when taking task off runqueue, the stat is updated.

--- a/include/linux/sched.h Fri May 18 20:51:06 2012
+++ b/include/linux/sched.h Fri May 18 20:32:20 2012
@@ -1255,6 +1255,11 @@ struct task_struct {
struct list_head run_list;
u64 last_ran;
u64 sched_time; /* sched_clock time spent running */
+#ifdef CONFIG_SCHEDSTATS
+#ifdef CONFIG_SMP
+ int wakeup_cpu; //for ttwu stat
+#endif
+#endif
#ifdef CONFIG_SMP
bool sticky; /* Soft affined flag */
#endif
--- a/kernel/sched/bfs.c Mon May 14 20:50:38 2012
+++ b/kernel/sched/bfs.c Fri May 18 20:46:22 2012
@@ -1145,6 +1145,30 @@ static inline void unstick_task(struct r
*/
static inline void take_task(int cpu, struct task_struct *p)
{
+#ifdef CONFIG_SCHEDSTATS
+#ifdef CONFIG_SMP
+ if (p->wakeup_cpu == -1)
+ goto skip;
+
+ if (cpu == p->wakeup_cpu) {
+ schedstat_inc(cpu_rq(cpu), ttwu_local);
+ }
+ else if (cpu_online(p->wakeup_cpu)) {
+ struct sched_domain *sd;
+
+ rcu_read_lock();
+ for_each_domain(p->wakeup_cpu, sd) {
+ if (cpumask_test_cpu(cpu, sched_domain_span(sd))) {
+ schedstat_inc(sd, ttwu_wake_remote);
+ break;
+ }
+ }
+ rcu_read_unlock();
+ }
+ p->wakeup_cpu = -1;
+skip:
+#endif
+#endif
set_task_cpu(p, cpu);
dequeue_task(p);
clear_sticky(p);
@@ -1485,30 +1509,13 @@ static void try_preempt(struct task_stru
}
#endif /* CONFIG_SMP */

-static void
-ttwu_stat(struct task_struct *p, int cpu, int wake_flags)
+static void ttwu_stat(struct task_struct *p, int cpu, int wake_flags)
{
#ifdef CONFIG_SCHEDSTATS
struct rq *rq = this_rq();

#ifdef CONFIG_SMP
- int this_cpu = smp_processor_id();
-
- if (cpu == this_cpu)
- schedstat_inc(rq, ttwu_local);
- else {
- struct sched_domain *sd;
-
- rcu_read_lock();
- for_each_domain(this_cpu, sd) {
- if (cpumask_test_cpu(cpu, sched_domain_span(sd))) {
- schedstat_inc(sd, ttwu_wake_remote);
- break;
- }
- }
- rcu_read_unlock();
- }
-
+ p->wakeup_cpu = smp_processor_id();
#endif /* CONFIG_SMP */

schedstat_inc(rq, ttwu_count);
@@ -1717,6 +1724,12 @@ void sched_fork(struct task_struct *p)
#if defined(CONFIG_SCHEDSTATS) || defined(CONFIG_TASK_DELAY_ACCT)
if (unlikely(sched_info_on()))
memset(&p->sched_info, 0, sizeof(p->sched_info));
+#endif
+
+#ifdef CONFIG_SCHEDSTATS
+#ifdef CONFIG_SMP
+ p->wakeup_cpu = -1;
+#endif
#endif

p->on_cpu = false;
--
--
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 [vger.kernel.org]
Please read the FAQ at [www.tux.org]

[Xen-devel] libxl: cannot start guest (2 replies)

Christoph Egger — Fri, 18 May 2012 22:25:02 +0800

Hi,

I am currently using c/s 25371:e9058654ca08.
When I try to start a HVM guest I get this failure:

xc: info: VIRTUAL MEMORY ARRANGEMENT:
Loader: 0000000000100000->000000000019bd04
TOTAL: 0000000000000000->00000000ff800000
ENTRY ADDRESS: 0000000000100000
xc: info: PHYSICAL MEMORY ALLOCATION:
4KB PAGES: 0x0000000000000200
2MB PAGES: 0x00000000000003fb
1GB PAGES: 0x0000000000000002
libxl: error: libxl.c:3208:libxl_sched_credit_domain_set: Cpu weight out
of range, valid values are within range from 1 to 65535
libxl: error: libxl_xshelp.c:102:libxl__xs_get_dompath: failed to get
dompath for 1: Bad file descriptor
libxl: error: libxl_xshelp.c:102:libxl__xs_get_dompath: failed to get
dompath for 0: Bad file descriptor
libxl: error: libxl_device.c:107:libxl__device_generic_add: xs
transaction failed: Bad file descriptor
libxl: error: libxl_xshelp.c:102:libxl__xs_get_dompath: failed to get
dompath for 1: Bad file descriptor
libxl: error: libxl_xshelp.c:102:libxl__xs_get_dompath: failed to get
dompath for 0: Bad file descriptor
libxl: error: libxl_device.c:107:libxl__device_generic_add: xs
transaction failed: Bad file descriptor
libxl: error: libxl_xshelp.c:102:libxl__xs_get_dompath: failed to get
dompath for 1: Bad file descriptor
libxl: error: libxl_xshelp.c:102:libxl__xs_get_dompath: failed to get
dompath for 0: Bad file descriptor
libxl: error: libxl_device.c:107:libxl__device_generic_add: xs
transaction failed: Bad file descriptor
libxl: error: libxl_xshelp.c:102:libxl__xs_get_dompath: failed to get
dompath for 1: Bad file descriptor
libxl: error: libxl_xshelp.c:102:libxl__xs_get_dompath: failed to get
dompath for 0: Bad file descriptor
libxl: error: libxl_device.c:107:libxl__device_generic_add: xs
transaction failed: Bad file descriptor
libxl: error: libxl_xshelp.c:102:libxl__xs_get_dompath: failed to get
dompath for 1: Bad file descriptor
libxl: error: libxl_xshelp.c:102:libxl__xs_get_dompath: failed to get
dompath for 0: Bad file descriptor
libxl: error: libxl_device.c:107:libxl__device_generic_add: xs
transaction failed: Bad file descriptor
libxl: error: libxl_xshelp.c:102:libxl__xs_get_dompath: failed to get
dompath for 1: Bad file descriptor
libxl: error: libxl_event.c:468:libxl__ev_xswatch_register: create watch
for path /local/domain/0/device-model/1/state: Bad file descriptor
libxl: error: libxl_dm.c:1069:device_model_spawn_outcome: domain 1
device model: spawn failed (rc=-3)
assertion "ao->in_initiator" failed: file "libxl_event.c", line 1388,
function "libxl__ao_complete_check_progress_reports"
[1] Abort trap (core dumped) xl create -c ${F...

Christoph

--
---to satisfy European Law for business letters:
Advanced Micro Devices GmbH
Einsteinring 24, 85689 Dornach b. Muenchen
Geschaeftsfuehrer: Alberto Bozzo, Andrew Bowd
Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
[lists.xen.org]

Re: [Xen-devel] [XenARM] Regarding Xen-ARM for Cortex-A8 on Fast Model Emulators [FME] (1 reply)

Ian Campbell — Fri, 18 May 2012 21:21:09 +0800

Questions about the port of Xen to ARM with virt extensions are best
posted to xen-devel, the xen-arm list focuses on the PV port. Adding
xen-devel since it seems you are mainly asking about the
w/-virt-extensions port.

On Fri, 2012-05-18 at 12:38 +0100, Krishna Pavan wrote:
> Please inform the status of Xen-ARM for Cortex-A8 CPU's on FME from
> ARM.

AFAIK no one has tried the w/-virt-extensions port on this model. The
only ones which I know have been tried are Cortex-A15 model and AEM.

Cortex-A8 already exists so I would be surprised if it were to be
updated with virt extensions, do you have some reason to think that it
will be?

Cortex A15 and Cortex A7 are on our radar as upcoming processors which
will have the extensions. Cortex A8 is not.

> These links here
> [wiki.xen.org]
> &
> [wiki.xen.org]
>
> give information about the dom0 running on FME.
>
> Though Xen-ARM is available for Cortex-A9 with KVM Virt extensions for
> Tegra2Harmony,

I'm confused by the mention of both Xen-ARM and KVM in this sentence.
Also did you mean A8 or A9 here?

> Cortex-A8 is widely used, and I would like to know the status.

AFAIK these chips don't/won't support virtualisation extensions.

Ian.

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
[lists.xen.org]

[PATCH 00/15] [GIT PULL] tracing: Updates for 3.5 (16 replies)

Steven Rostedt — Fri, 18 May 2012 22:21:18 +0800

Ingo,

This should be my last set of changes for the next merge window.

Please pull the latest tip/perf/core tree, which can be found at:

git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
tip/perf/core

Head SHA1: b732d439cb43336cd6d7e804ecb2c81193ef63b0

Namhyung Kim (1):
tracing: Check return value of tracing_dentry_percpu()

Steven Rostedt (11):
tracing: Clean up tracing_mark_write()
ring-buffer: Add integrity check at end of iter read
ring-buffer: Reset head page before running self test
ftrace: Sort all function addresses, not just per page
ftrace: Remove extra helper functions
ftrace: Speed up search by skipping pages by address
ftrace: Consolidate ftrace_location() and ftrace_text_reserved()
ftrace: Return record ip addr for ftrace_location()
ftrace: Make ftrace_modify_all_code() global for archs to use
ftrace/x86: Have x86 ftrace use the ftrace_modify_all_code()
ftrace: Remove selecting FRAME_POINTER with FUNCTION_TRACER

Vaibhav Nagarnaik (3):
ring-buffer: Make removal of ring buffer pages atomic
ring-buffer: Make addition of pages in ring buffer atomic
tracing: change CPU ring buffer state from tracing_cpumask

----
arch/x86/kernel/ftrace.c | 15 +-
include/asm-generic/vmlinux.lds.h | 2 +-
include/linux/ftrace.h | 5 +-
kernel/trace/Kconfig | 1 -
kernel/trace/ftrace.c | 198 ++++++++++---------
kernel/trace/ring_buffer.c | 394 +++++++++++++++++++++++++++++--------
kernel/trace/trace.c | 49 ++---
7 files changed, 446 insertions(+), 218 deletions(-)

[PATCH RFC v2 1/2] pinctrl: add pinctrl_add_gpio_ranges function (no replies)

Dong Aisheng — Fri, 18 May 2012 21:09:08 +0800

From: Dong Aisheng

Signed-off-by: Dong Aisheng
---
drivers/pinctrl/core.c | 22 ++++++++++++++++++++++
include/linux/pinctrl/pinctrl.h | 6 ++++++
2 files changed, 28 insertions(+), 0 deletions(-)

diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c
index c3b331b..916ed49 100644
--- a/drivers/pinctrl/core.c
+++ b/drivers/pinctrl/core.c
@@ -346,6 +346,28 @@ void pinctrl_remove_gpio_range(struct pinctrl_dev *pctldev,
}
EXPORT_SYMBOL_GPL(pinctrl_remove_gpio_range);

+void pinctrl_add_gpio_ranges(struct pinctrl_dev *pctldev,
+ struct pinctrl_gpio_range *ranges,
+ unsigned nranges)
+{
+ int i;
+
+ for (i = 0; i < nranges; i++)
+ pinctrl_add_gpio_range(pctldev, &ranges);
+}
+EXPORT_SYMBOL_GPL(pinctrl_add_gpio_ranges);
+
+void pinctrl_remove_gpio_ranges(struct pinctrl_dev *pctldev,
+ struct pinctrl_gpio_range *ranges,
+ unsigned nranges)
+{
+ int i;
+
+ for (i = 0; i < nranges; i++)
+ pinctrl_remove_gpio_range(pctldev, &ranges);
+}
+EXPORT_SYMBOL_GPL(pinctrl_remove_gpio_ranges);
+
/**
* pinctrl_get_group_selector() - returns the group selector for a group
* @pctldev: the pin controller handling the group
diff --git a/include/linux/pinctrl/pinctrl.h b/include/linux/pinctrl/pinctrl.h
index 3b894a6..6a29965 100644
--- a/include/linux/pinctrl/pinctrl.h
+++ b/include/linux/pinctrl/pinctrl.h
@@ -133,6 +133,12 @@ extern void pinctrl_add_gpio_range(struct pinctrl_dev *pctldev,
struct pinctrl_gpio_range *range);
extern void pinctrl_remove_gpio_range(struct pinctrl_dev *pctldev,
struct pinctrl_gpio_range *range);
+extern void pinctrl_add_gpio_ranges(struct pinctrl_dev *pctldev,
+ struct pinctrl_gpio_range *ranges,
+ unsigned nranges);
+extern void pinctrl_remove_gpio_ranges(struct pinctrl_dev *pctldev,
+ struct pinctrl_gpio_range *ranges,
+ unsigned nranges);
extern const char *pinctrl_dev_get_name(struct pinctrl_dev *pctldev);
extern void *pinctrl_dev_get_drvdata(struct pinctrl_dev *pctldev);
#else
--
1.7.0.4

--
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 [vger.kernel.org]
Please read the FAQ at [www.tux.org]

[PATCH RFC v2 2/2] pinctrl: add pinctrl gpio binding support (no replies)

Dong Aisheng — Fri, 18 May 2012 21:09:08 +0800

From: Dong Aisheng

The gpio ranges standard dt binding format is
<&gpio $gpio_offset $pin_offset $npin>

The core will parse and register the pinctrl gpio ranges
from device tree.

TODO: add binding doc.

Signed-off-by: Dong Aisheng

---
ChangeLog v1->v2:
* introduce standard binding for gpio range.
---
drivers/pinctrl/devicetree.c | 95 +++++++++++++++++++++++++++++++++++++++
drivers/pinctrl/devicetree.h | 3 -
include/linux/pinctrl/pinctrl.h | 22 +++++++++
3 files changed, 117 insertions(+), 3 deletions(-)

diff --git a/drivers/pinctrl/devicetree.c b/drivers/pinctrl/devicetree.c
index fcb1de4..c1b87e6 100644
--- a/drivers/pinctrl/devicetree.c
+++ b/drivers/pinctrl/devicetree.c
@@ -17,7 +17,9 @@
*/

#include
+#include
#include
+#include
#include
#include

@@ -247,3 +249,96 @@ err:
pinctrl_dt_free_maps(p);
return ret;
}
+
+/*
+ * pinctrl_dt_add_gpio_range() - parse and register GPIO ranges from device tree
+ * @pctldev: pin controller device to add the range to
+ * @np: the device node contains the property @propname
+ * @propname: a list of phandles of gpios and corresponding data.
+ * The format is: <&gpio0 $gpio_offset $pin_offset $count>
+ */
+int pinctrl_dt_add_gpio_ranges(struct pinctrl_dev *pctldev,
+ struct device_node *np,
+ const char *propname)
+{
+ struct pinctrl_gpio_range *ranges;
+ unsigned int gpio_offset, pin_offset, npins;
+ struct device_node *np_gpio;
+ struct property *prop;
+ const __be32 *list;
+ phandle phandle;
+ int nranges;
+ int size;
+ int i;
+
+ if (!np || !propname) {
+ dev_err(pctldev->dev, "no device node or gpios propname\n");
+ return -EINVAL;
+ }
+
+ prop = of_find_property(np, propname, &size);
+ if (!prop)
+ return -ENODEV;
+
+ list = prop->value;
+ size /= sizeof(*list);
+ if (size % 4) {
+ dev_err(pctldev->dev, "wrong gpio range table format\n");
+ return -EINVAL;
+ }
+
+ nranges = size /4;
+ ranges = devm_kzalloc(pctldev->dev, nranges * sizeof(*ranges),
+ GFP_KERNEL);
+ for (i = 0; i < nranges; i++) {
+ phandle = be32_to_cpup(list++);
+ np_gpio = of_find_node_by_phandle(phandle);
+ if (!np_gpio) {
+ dev_err(pctldev->dev,
+ "failed to find gpio node(%s)\n",
+ np_gpio->name);
+ return -ENODEV;
+ }
+
+ ranges.gc = of_node_to_gpiochip(np_gpio);
+ if (!ranges.gc) {
+ dev_err(pctldev->dev,
+ "can not find gpio chip of node(%s)\n",
+ np->name);
+ of_node_put(np_gpio);
+ return -ENODEV;
+ }
+
+ gpio_offset = be32_to_cpu(*list++);
+ pin_offset = be32_to_cpu(*list++);
+ npins = be32_to_cpu(*list++);
+
+ if (gpio_offset < 0 ||
+ gpio_offset > ranges.gc->ngpio ||
+ pin_offset < 0 || npins < 0) {
+ dev_err(pctldev->dev,
+ "wrong data in the gpio range table\n");
+ of_node_put(np_gpio);
+ return -ENODEV;
+ }
+
+ ranges.name = dev_name(pctldev->dev);
+ ranges.base = ranges.gc->base + gpio_offset;
+ ranges.pin_base = pin_offset;
+ ranges.npins = npins;
+ of_node_put(np_gpio);
+ }
+
+ pinctrl_add_gpio_ranges(pctldev, ranges, nranges);
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(pinctrl_dt_add_gpio_ranges);
+
+void pinctrl_dt_remove_gpio_ranges(struct pinctrl_dev *pctldev,
+ struct pinctrl_gpio_range *ranges,
+ unsigned nranges)
+{
+ pinctrl_remove_gpio_ranges(pctldev, ranges, nranges);
+}
+EXPORT_SYMBOL_GPL(pinctrl_dt_remove_gpio_ranges);
diff --git a/drivers/pinctrl/devicetree.h b/drivers/pinctrl/devicetree.h
index 760bc49..9f79657 100644
--- a/drivers/pinctrl/devicetree.h
+++ b/drivers/pinctrl/devicetree.h
@@ -20,9 +20,7 @@

void pinctrl_dt_free_maps(struct pinctrl *p);
int pinctrl_dt_to_map(struct pinctrl *p);
-
#else
-
static inline int pinctrl_dt_to_map(struct pinctrl *p)
{
return 0;
@@ -31,5 +29,4 @@ static inline int pinctrl_dt_to_map(struct pinctrl *p)
static inline void pinctrl_dt_free_maps(struct pinctrl *p)
{
}
-
#endif
diff --git a/include/linux/pinctrl/pinctrl.h b/include/linux/pinctrl/pinctrl.h
index 6a29965..98d77b4 100644
--- a/include/linux/pinctrl/pinctrl.h
+++ b/include/linux/pinctrl/pinctrl.h
@@ -141,6 +141,28 @@ extern void pinctrl_remove_gpio_ranges(struct pinctrl_dev *pctldev,
unsigned nranges);
extern const char *pinctrl_dev_get_name(struct pinctrl_dev *pctldev);
extern void *pinctrl_dev_get_drvdata(struct pinctrl_dev *pctldev);
+
+#ifdef CONFIG_OF
+extern int pinctrl_dt_add_gpio_ranges(struct pinctrl_dev *pctldev,
+ struct device_node *np,
+ const char *propname);
+extern void pinctrl_dt_remove_gpio_ranges(struct pinctrl_dev *pctldev,
+ struct pinctrl_gpio_range *ranges,
+ unsigned nranges);
+#else
+static inline int pinctrl_dt_add_gpio_ranges(struct pinctrl_dev *pctldev,
+ struct device_node *np,
+ const char *propname)
+{
+ return 0;
+}
+static void pinctrl_dt_remove_gpio_ranges(struct pinctrl_dev *pctldev,
+ struct pinctrl_gpio_range *ranges,
+ unsigned nranges)
+{
+}
+#endif /* !CONFIG_OF */
+
#else

struct pinctrl_dev;
--
1.7.0.4

--
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 [vger.kernel.org]
Please read the FAQ at [www.tux.org]

======= Hint (no replies)

Ling — Fri, 18 May 2012 20:43:02 +0800

I need your names in Full and Address to enable me furnish you with details of my Deal.
Ling
--
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 [vger.kernel.org]
Please read the FAQ at [www.tux.org]

[GIT PULL] block fixes for 3.4 final (no replies)

Jens Axboe — Fri, 18 May 2012 20:33:04 +0800

Hi Linus,

A few small, but important fixes. Most of them are marked
for stable as we..

- Fix failure to release a semaphore on error path in mtip32xx.
- Fix crashable condition in bio_get_nr_vecs().
- Don't mark end-of-disk buffers as mapped, limit it to
i_size.
- Fix for build problem with CONFIG_BLOCK=n on arm at least.
- Fix for a buffer overlow on UUID partition printing.
- Trivial removal of unused variables in dac960.

Please pull!

git://git.kernel.dk/linux-block.git for-linus

----------------------------------------------------------------
Asai Thambi S P (1):
mtip32xx: release the semaphore on an error path

Bernd Schubert (1):
bio allocation failure due to bio_get_nr_vecs()

Jeff Moyer (1):
block: don't mark buffers beyond end of disk as mapped

Jesper Juhl (1):
dac960: Remove unused variables from DAC960_CreateProcEntries()

Russell King (1):
Fix blkdev.h build errors when BLOCK=n

Tejun Heo (1):
block: fix buffer overflow when printing partition UUIDs

block/genhd.c | 10 ++++++----
drivers/block/DAC960.c | 23 ++++++++++-------------
drivers/block/mtip32xx/mtip32xx.c | 4 +++-
fs/bio.c | 7 ++++++-
fs/block_dev.c | 6 +++---
fs/buffer.c | 4 +++-
include/linux/blkdev.h | 3 ++-
include/linux/fs.h | 1 +
include/linux/genhd.h | 6 ------
9 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/block/genhd.c b/block/genhd.c
index df9816e..9cf5583 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -743,7 +743,7 @@ void __init printk_all_partitions(void)
struct hd_struct *part;
char name_buf[BDEVNAME_SIZE];
char devt_buf[BDEVT_SIZE];
- u8 uuid[PARTITION_META_INFO_UUIDLTH * 2 + 1];
+ char uuid_buf[PARTITION_META_INFO_UUIDLTH * 2 + 5];

/*
* Don't show empty devices or things that have been
@@ -762,14 +762,16 @@ void __init printk_all_partitions(void)
while ((part = disk_part_iter_next(&piter))) {
bool is_part0 = part == &disk->part0;

- uuid[0] = 0;
+ uuid_buf[0] = '\0';
if (part->info)
- part_unpack_uuid(part->info->uuid, uuid);
+ snprintf(uuid_buf, sizeof(uuid_buf), "%pU",
+ part->info->uuid);

printk("%s%s %10llu %s %s", is_part0 ? "" : " ",
bdevt_str(part_devt(part), devt_buf),
(unsigned long long)part->nr_sects >> 1,
- disk_name(disk, part->partno, name_buf), uuid);
+ disk_name(disk, part->partno, name_buf),
+ uuid_buf);
if (is_part0) {
if (disk->driverfs_dev != NULL &&
disk->driverfs_dev->driver != NULL)
diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c
index 8db9089..9a13e88 100644
--- a/drivers/block/DAC960.c
+++ b/drivers/block/DAC960.c
@@ -6580,24 +6580,21 @@ static const struct file_operations dac960_user_command_proc_fops = {

static void DAC960_CreateProcEntries(DAC960_Controller_T *Controller)
{
- struct proc_dir_entry *StatusProcEntry;
struct proc_dir_entry *ControllerProcEntry;
- struct proc_dir_entry *UserCommandProcEntry;

if (DAC960_ProcDirectoryEntry == NULL) {
- DAC960_ProcDirectoryEntry = proc_mkdir("rd", NULL);
- StatusProcEntry = proc_create("status", 0,
- DAC960_ProcDirectoryEntry,
- &dac960_proc_fops);
+ DAC960_ProcDirectoryEntry = proc_mkdir("rd", NULL);
+ proc_create("status", 0, DAC960_ProcDirectoryEntry,
+ &dac960_proc_fops);
}

- sprintf(Controller->ControllerName, "c%d", Controller->ControllerNumber);
- ControllerProcEntry = proc_mkdir(Controller->ControllerName,
- DAC960_ProcDirectoryEntry);
- proc_create_data("initial_status", 0, ControllerProcEntry, &dac960_initial_status_proc_fops, Controller);
- proc_create_data("current_status", 0, ControllerProcEntry, &dac960_current_status_proc_fops, Controller);
- UserCommandProcEntry = proc_create_data("user_command", S_IWUSR | S_IRUSR, ControllerProcEntry, &dac960_user_command_proc_fops, Controller);
- Controller->ControllerProcEntry = ControllerProcEntry;
+ sprintf(Controller->ControllerName, "c%d", Controller->ControllerNumber);
+ ControllerProcEntry = proc_mkdir(Controller->ControllerName,
+ DAC960_ProcDirectoryEntry);
+ proc_create_data("initial_status", 0, ControllerProcEntry, &dac960_initial_status_proc_fops, Controller);
+ proc_create_data("current_status", 0, ControllerProcEntry, &dac960_current_status_proc_fops, Controller);
+ proc_create_data("user_command", S_IWUSR | S_IRUSR, ControllerProcEntry, &dac960_user_command_proc_fops, Controller);
+ Controller->ControllerProcEntry = ControllerProcEntry;
}

diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c
index 00f9fc9..304000c 100644
--- a/drivers/block/mtip32xx/mtip32xx.c
+++ b/drivers/block/mtip32xx/mtip32xx.c
@@ -2510,8 +2510,10 @@ static struct scatterlist *mtip_hw_get_scatterlist(struct driver_data *dd,
up(&dd->port->cmd_slot);
return NULL;
}
- if (unlikely(*tag < 0))
+ if (unlikely(*tag < 0)) {
+ up(&dd->port->cmd_slot);
return NULL;
+ }

return dd->port->commands[*tag].sg;
}
diff --git a/fs/bio.c b/fs/bio.c
index e453924..84da885 100644
--- a/fs/bio.c
+++ b/fs/bio.c
@@ -505,9 +505,14 @@ EXPORT_SYMBOL(bio_clone);
int bio_get_nr_vecs(struct block_device *bdev)
{
struct request_queue *q = bdev_get_queue(bdev);
- return min_t(unsigned,
+ int nr_pages;
+
+ nr_pages = min_t(unsigned,
queue_max_segments(q),
queue_max_sectors(q) / (PAGE_SIZE >> 9) + 1);
+
+ return min_t(unsigned, nr_pages, BIO_MAX_PAGES);
+
}
EXPORT_SYMBOL(bio_get_nr_vecs);

diff --git a/fs/block_dev.c b/fs/block_dev.c
index e08f6a20..ba11c30 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -70,7 +70,7 @@ static void bdev_inode_switch_bdi(struct inode *inode,
spin_unlock(&dst->wb.list_lock);
}

-static sector_t max_block(struct block_device *bdev)
+sector_t blkdev_max_block(struct block_device *bdev)
{
sector_t retval = ~((sector_t)0);
loff_t sz = i_size_read(bdev->bd_inode);
@@ -163,7 +163,7 @@ static int
blkdev_get_block(struct inode *inode, sector_t iblock,
struct buffer_head *bh, int create)
{
- if (iblock >= max_block(I_BDEV(inode))) {
+ if (iblock >= blkdev_max_block(I_BDEV(inode))) {
if (create)
return -EIO;

@@ -185,7 +185,7 @@ static int
blkdev_get_blocks(struct inode *inode, sector_t iblock,
struct buffer_head *bh, int create)
{
- sector_t end_block = max_block(I_BDEV(inode));
+ sector_t end_block = blkdev_max_block(I_BDEV(inode));
unsigned long max_blocks = bh->b_size >> inode->i_blkbits;

if ((iblock + max_blocks) > end_block) {
diff --git a/fs/buffer.c b/fs/buffer.c
index 351e18e..ad5938c 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -921,6 +921,7 @@ init_page_buffers(struct page *page, struct block_device *bdev,
struct buffer_head *head = page_buffers(page);
struct buffer_head *bh = head;
int uptodate = PageUptodate(page);
+ sector_t end_block = blkdev_max_block(I_BDEV(bdev->bd_inode));

do {
if (!buffer_mapped(bh)) {
@@ -929,7 +930,8 @@ init_page_buffers(struct page *page, struct block_device *bdev,
bh->b_blocknr = block;
if (uptodate)
set_buffer_uptodate(bh);
- set_buffer_mapped(bh);
+ if (block < end_block)
+ set_buffer_mapped(bh);
}
block++;
bh = bh->b_this_page;
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 2aa2466..4d4ac24 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -1,9 +1,10 @@
#ifndef _LINUX_BLKDEV_H
#define _LINUX_BLKDEV_H

+#include
+
#ifdef CONFIG_BLOCK

-#include
#include
#include
#include
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 8de6755..25c40b9 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2051,6 +2051,7 @@ extern void unregister_blkdev(unsigned int, const char *);
extern struct block_device *bdget(dev_t);
extern struct block_device *bdgrab(struct block_device *bdev);
extern void bd_set_size(struct block_device *, loff_t size);
+extern sector_t blkdev_max_block(struct block_device *bdev);
extern void bd_forget(struct inode *inode);
extern void bdput(struct block_device *);
extern void invalidate_bdev(struct block_device *);
diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index e61d319..017a7fb 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -222,12 +222,6 @@ static inline void part_pack_uuid(const u8 *uuid_str, u8 *to)
}
}

-static inline char *part_unpack_uuid(const u8 *uuid, char *out)
-{
- sprintf(out, "%pU", uuid);
- return out;
-}
-
static inline int disk_max_parts(struct gendisk *disk)
{
if (disk->flags & GENHD_FL_EXT_DEVT)

--
Jens Axboe

--
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 [vger.kernel.org]
Please read the FAQ at [www.tux.org]

[PATCH] regulator: tps65910: fixed build error (no replies)

Laxman Dewangan — Fri, 18 May 2012 20:03:06 +0800

Some of the api calls are not changed and it leads
to following build error:
/regulator/tps65910-regulator.c: In function 'tps65910_enable':
/regulator/tps65910-regulator.c:491:2: error: implicit declaration of
function 'tps65910_set_bits'
/regulator/tps65910-regulator.c: In function 'tps65910_disable':
/regulator/tps65910-regulator.c:504:2: error: implicit declaration of
function 'tps65910_clear_bits'
/regulator/tps65910-regulator.c: In function 'tps65910_get_voltage':
/regulator/tps65910-regulator.c:628:2: warning: passing argument 1 of
'tps65910_reg_read' from incompatible pointer type]
/linux/mfd/tps65910.h:856:19: note: expected 'struct tps65910 *' but
argument is of type 'struct tps65910_reg *'
/regulator/tps65910-regulator.c:628:2: error: too few arguments to
function 'tps65910_reg_read'

cc1: some warnings being treated as errors

Signed-off-by: Laxman Dewangan
---
This patch fixes the compilation error in Samuel's tree and should go
through Samuel's for-next.
Some of the function is removed from the regulator for-next and so error
in line number 491 and 504 will not be there but still error at 628 will
be there.

drivers/regulator/tps65910-regulator.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/regulator/tps65910-regulator.c b/drivers/regulator/tps65910-regulator.c
index b38fb64..852b05b 100644
--- a/drivers/regulator/tps65910-regulator.c
+++ b/drivers/regulator/tps65910-regulator.c
@@ -488,7 +488,7 @@ static int tps65910_enable(struct regulator_dev *dev)
if (reg < 0)
return reg;

- return tps65910_set_bits(mfd, reg, TPS65910_SUPPLY_STATE_ENABLED);
+ return tps65910_reg_set_bits(mfd, reg, TPS65910_SUPPLY_STATE_ENABLED);
}

static int tps65910_disable(struct regulator_dev *dev)
@@ -501,7 +501,7 @@ static int tps65910_disable(struct regulator_dev *dev)
if (reg < 0)
return reg;

- return tps65910_clear_bits(mfd, reg, TPS65910_SUPPLY_STATE_ENABLED);
+ return tps65910_reg_clear_bits(mfd, reg, TPS65910_SUPPLY_STATE_ENABLED);
}

static int tps65910_enable_time(struct regulator_dev *dev)
@@ -625,7 +625,7 @@ static int tps65910_get_voltage(struct regulator_dev *dev)
if (reg < 0)
return reg;

- value = tps65910_reg_read(pmic, reg);
+ value = tps65910_reg_read_locked(pmic, reg);
if (value < 0)
return value;

--
1.7.1.1

--
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 [vger.kernel.org]
Please read the FAQ at [www.tux.org]

[Xen-devel] Import Qemu commit "audio: split IN_T into two separate constants" (1 reply)

Roger Pau Monne — Fri, 18 May 2012 20:13:09 +0800

Hello,

I would like to request the import of the Qemu commit:

commit a28853871d6ef5ec4afe810a43fdde859dfdaa7e
Author: Roger Pau Monne
Date: Fri May 18 12:08:14 2012 +0100
audio: split IN_T into two separate constants

Into our qemu-upstream tree, since it's needed for NetBSD build.

Thanks.

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
[lists.xen.org]

[Xen-devel] [xen-unstable test] 12920: regressions - FAIL (no replies)

xen.org — Fri, 18 May 2012 19:54:08 +0800

flight 12920 xen-unstable real [real]
[www.chiark.greenend.org.uk]

Regressions :-(

Tests which did not succeed and are blocking,
including tests which could not be run:
test-amd64-amd64-xl-pcipt-intel 8 debian-fixup fail REGR. vs. 12884
test-amd64-amd64-xl-qemuu-win7-amd64 12 guest-localmigrate/x10 fail REGR. vs. 12876

Tests which are failing intermittently (not blocking):
test-amd64-i386-xl 9 guest-start fail pass in 12915

Regressions which are regarded as allowable (not blocking):
test-amd64-i386-qemuu-rhel6hvm-amd 9 guest-start.2 fail in 12915 like 12884

Tests which did not succeed, but are not blocking:
test-amd64-i386-rhel6hvm-intel 11 leak-check/check fail never pass
test-amd64-i386-qemuu-rhel6hvm-intel 9 guest-start.2 fail never pass
test-amd64-i386-qemuu-rhel6hvm-amd 11 leak-check/check fail never pass
test-i386-i386-xl-qemuu-winxpsp3 13 guest-stop fail never pass
test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass
test-amd64-amd64-win 16 leak-check/check fail never pass
test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass
test-amd64-i386-rhel6hvm-amd 11 leak-check/check fail never pass
test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass
test-i386-i386-xl-winxpsp3 13 guest-stop fail never pass
test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass
test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass
test-amd64-amd64-xl-qemuu-winxpsp3 13 guest-stop fail never pass
test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass
test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass
test-amd64-i386-win 16 leak-check/check fail never pass
test-i386-i386-win 16 leak-check/check fail never pass
test-i386-i386-xl-win 13 guest-stop fail never pass
test-amd64-amd64-xl-win 13 guest-stop fail never pass

version targeted for testing:
xen 28831853d1a8
baseline version:
xen f8279258e3c9

jobs:
build-amd64 pass
build-i386 pass
build-amd64-oldkern pass
build-i386-oldkern pass
build-amd64-pvops pass
build-i386-pvops pass
test-amd64-amd64-xl pass
test-amd64-i386-xl fail
test-i386-i386-xl pass
test-amd64-i386-rhel6hvm-amd fail
test-amd64-i386-qemuu-rhel6hvm-amd fail
test-amd64-amd64-xl-qemuu-win7-amd64 fail
test-amd64-amd64-xl-win7-amd64 fail
test-amd64-i386-xl-win7-amd64 fail
test-amd64-i386-xl-credit2 pass
test-amd64-amd64-xl-pcipt-intel fail
test-amd64-i386-rhel6hvm-intel fail
test-amd64-i386-qemuu-rhel6hvm-intel fail
test-amd64-i386-xl-multivcpu pass
test-amd64-amd64-pair pass
test-amd64-i386-pair pass
test-i386-i386-pair pass
test-amd64-amd64-xl-sedf-pin pass
test-amd64-amd64-pv pass
test-amd64-i386-pv pass
test-i386-i386-pv pass
test-amd64-amd64-xl-sedf pass
test-amd64-i386-win-vcpus1 fail
test-amd64-i386-xl-win-vcpus1 fail
test-amd64-i386-xl-winxpsp3-vcpus1 fail
test-amd64-amd64-win fail
test-amd64-i386-win fail
test-i386-i386-win fail
test-amd64-amd64-xl-win fail
test-i386-i386-xl-win fail
test-amd64-amd64-xl-qemuu-winxpsp3 fail
test-i386-i386-xl-qemuu-winxpsp3 fail
test-amd64-i386-xend-winxpsp3 fail
test-amd64-amd64-xl-winxpsp3 fail
test-i386-i386-xl-winxpsp3 fail

------------------------------------------------------------
sg-report-flight on woking.cam.xci-test.com
logs: /home/xc_osstest/logs
images: /home/xc_osstest/images

Logs, config files, etc. are available at
[www.chiark.greenend.org.uk]

Test harness code can be found at
[xenbits.xensource.com]

Not pushing.

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
[lists.xen.org]

[Xen-devel] libxl: build failure due to 'libxl_domain_type' (4 replies)

Christoph Egger — Fri, 18 May 2012 22:53:13 +0800

Hi,

I get this libxl build error:

libxl.c: In function 'libxl_primary_console_exec':
libxl.c:1233:9: error: case value '4294967295' not in enumerated type
'libxl_domain_type'

I see that libxl__domain_type() can returns -1 which is not part
of 'enum libxl_domain_type'.

Christoph

--
---to satisfy European Law for business letters:
Advanced Micro Devices GmbH
Einsteinring 24, 85689 Dornach b. Muenchen
Geschaeftsfuehrer: Alberto Bozzo, Andrew Bowd
Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
[lists.xen.org]

Where's the Android kernel sources git repository gone (1 reply)

Josh Branning — Fri, 18 May 2012 21:03:14 +0800

"wget [android.git.kernel.org];

Gives me a 404 Not Found,

Any help with this very much appreciated.
--
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 [vger.kernel.org]
Please read the FAQ at [www.tux.org]

[Full-disclosure] SEC Consult SA-20120518 :: Memory overwrite vulnerability in libwpd (OpenOffice.org) - CVE-2012-2149 (no replies)

SEC Consult Vulnerability Lab — Fri, 18 May 2012 19:09:02 +0800

SEC Consult Vulnerability Lab Security Advisory < 20120518-0 >
=======================================================================
title: libwpd WPXContentListener::_closeTableRow() memory
overwrite
product: OpenOffice.org
vulnerable version: 3.3.0/3.4 Beta 1 and probably earlier versions
fixed version: 3.4
CVE: CVE-2012-2149
impact: high
homepage: [www.openoffice.org]
found: 2011-09-01
by: K. Gudinavicius
SEC Consult Vulnerability Lab
[www.sec-consult.com]
=======================================================================

Vendor description:
-------------------
"OpenOffice.org 3 is the leading open-source office software suite for
word processing, spreadsheets, presentations, graphics, databases and
more. It is available in many languages and works on all common
computers."

Source: [why.openoffice.org]

Vulnerability overview/description:
-----------------------------------
OpenOffice.org includes the customized libwpd version 0.8.8 library for
parsing WordPerfect documents. The used version of the libwpd library
suffers from a memory overwrite vulnerability when reading a specially
crafted WPD file. Successful exploitation of this vulnerability could
result in an arbitrary code execution within the OpenOffice.org
software suite.

Proof of concept:
-----------------
The vulnerability resides in the WPXContentListener::_closeTableRow()
function which is declared in the WPXContentListener.cpp file. The
function doesn't check if the variable's m_ps->m_currentTableCol value
is less than zero before entering the while loop which leads to an
integer overflow and decrementation of the memory location pointed by
m_ps->m_numRowsToSkip[m_ps->m_currentTableCol] address if the
conditions are met. Related code excerpt:

void WPXContentListener::_closeTableRow()
{
if (m_ps->m_isTableRowOpened)
{
while ((long)m_ps->m_currentTableCol <
(long)m_ps->m_numRowsToSkip.size()) {
if
(!m_ps->m_numRowsToSkip[m_ps->m_currentTableCol]) {
RGBSColor tmpCellBorderColor(0x00,
0x00, 0x00, 0x64); _openTableCell(1, 1, 0xFF, 0, 0,
&tmpCellBorderColor, TOP); _closeTableCell();
}
else
m_ps->m_numRowsToSkip[m_ps->m_currentTableCol++]--;
}

if (m_ps->m_isTableCellOpened)
_closeTableCell();
m_listenerImpl->closeTableRow();
}
m_ps->m_isTableRowOpened = false;
}

The variable's m_ps->m_currentTableCol value can be influenced by
calling WPXContentListener::_closeTable() function which sets its value
to -1 after the call to WPXContentListener::_openTableRow() function.
Calling the _openTableRow() function again results in
WPXContentListener::_closeTableRow() being called and the memory
location pointed by the m_ps->m_numRowsToSkip[-1] address is being
decremented.

It was possible to build a specially crafted WPD file containing byte
sequences that represent the above mentioned functions to decrement
valid C++ object's pointer as many times as it needed to achieve
arbitrary code execution when virtual functions of that object were
called. The exploit code will not be published.

Debugger output:

Breakpoint 0 hit
eax=070fcbd4 ebx=00000000 ecx=ffffffff edx=0ebd25f0 esi=0185c928
edi=0185c920 eip=0eb9167e esp=0185c860 ebp=0185c86c iopl=0 nv
up ei pl zr ac pe nc cs=001b ss=0023 ds=0023 es=0023 fs=003b
gs=0000 efl=00000256 wpftmi!component_getFactory+0x20355:
0eb9167e ff08 dec dword ptr [eax]
ds:0023:070fcbd4=0ebdb288 0:000> g
Breakpoint 0 hit
eax=070fcbd4 ebx=00000000 ecx=ffffffff edx=0ebd25f0 esi=0185c928
edi=0185c920 eip=0eb9167e esp=0185c860 ebp=0185c86c iopl=0 nv
up ei pl zr ac pe nc cs=001b ss=0023 ds=0023 es=0023 fs=003b
gs=0000 efl=00000256 wpftmi!component_getFactory+0x20355:
0eb9167e ff08 dec dword ptr [eax]
ds:0023:070fcbd4=0ebdb287 0:000> g
Breakpoint 0 hit
eax=070fcbd4 ebx=00000000 ecx=ffffffff edx=0ebd25f0 esi=0185c928
edi=0185c920 eip=0eb9167e esp=0185c860 ebp=0185c86c iopl=0 nv
up ei pl zr ac pe nc cs=001b ss=0023 ds=0023 es=0023 fs=003b
gs=0000 efl=00000256 wpftmi!component_getFactory+0x20355:
0eb9167e ff08 dec dword ptr [eax]
ds:0023:070fcbd4=0ebdb286 0:000> g
Breakpoint 0 hit
eax=070fcbd4 ebx=00000000 ecx=ffffffff edx=0ebd25f0 esi=0185c928
edi=0185c920 eip=0eb9167e esp=0185c850 ebp=0185c85c iopl=0 nv
up ei pl zr ac pe nc cs=001b ss=0023 ds=0023 es=0023 fs=003b
gs=0000 efl=00000256 wpftmi!component_getFactory+0x20355:
0eb9167e ff08 dec dword ptr [eax]
ds:0023:070fcbd4=0ebdb285 <...>

Vulnerable / tested versions:
-----------------------------
The vulnerability has been verified to exist in versions 3.3.0 and
3.4 Beta 1 of OpenOffice.org, which were the most recent versions at
the time of discovery.

Vendor contact timeline:
------------------------
2011-09-19: Contacting vendor through securityteam@openoffice.org
2011-09-21: Vendor response, clarification request
2011-09-21: Sent answer
2011-10-05: Vendor response, clarification request
2011-10-05: Sent answer
2011-10-13: Contacted vendor asking for status
2011-11-23: Contacted vendor asking for status
2011-11-23: Vendor response, project moved to Apache
2011-11-24: Contacting vendor through ooo-security@incubator.apache.org
2011-12-05: Contacted vendor asking for status
2011-12-05: Vendor response
2012-01-09: Contacted vendor asking for status
2012-01-09: Vendor response, Apache OpenOffice 3.4 release is planned
in Q1 2012.
2012-03-22: Contacted vendor asking for status
2012-04-19: Contacted vendor asking for status
2012-04-23: Vendor response
2012-04-24: Contacted vendor asking for CVE#
2012-04-30: Vendor response including CVE#
2012-05-07: Contacted vendor asking for status
2012-05-07: Vendor response, date of the release announcement for
OpenOffice 3.4
2012-05-07: Vendor releases Apache OpenOffice 3.4
2012-05-16: Vendor releases security bulletin which addresses this
vulnerability
2012-05-18: SEC Consult releases detailed advisory

Solution:
---------
OpenOffice.org 3.3.0 and 3.4 beta users should upgrade to Apache
OpenOffice 3.4.

Workaround:
-----------
Untrusted WPD documents should be avoided.

Advisory URL:
-------------
[www.sec-consult.com]

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
SEC Consult Unternehmensberatung GmbH

Office Vienna
Mooslackengasse 17
A-1190 Vienna
Austria

Tel.: +43 / 1 / 890 30 43 - 0
Fax.: +43 / 1 / 890 30 43 - 25
Mail: research at sec-consult dot com
[www.sec-consult.com]

EOF K. Gudinavicius / @2012

_______________________________________________
Full-Disclosure - We believe in it.
Charter: [lists.grok.org.uk]
Hosted and sponsored by Secunia - [secunia.com]

Race in vt_event_wait() during suspend/resume (1 reply)

Rabin Vincent — Fri, 18 May 2012 19:39:12 +0800

pm_restore_console() is called from the suspend/resume path,
this calls vt_move_to_console(), which calls vt_event_wait().

There's a race in this path which causes the process
which requests the suspend to sleep indefinitely waiting
for an event which already happened:

P1 P2
vt_move_to_console()
set_console()
schedule_console_callback()
vt_waitactive()
check n == fg_console +1
console_callback()
switch_screen()
vt_event_post() // no waiters

vt_event_wait() // forever

I think the following should fix it. Comments?

diff --git a/drivers/tty/vt/vt_ioctl.c b/drivers/tty/vt/vt_ioctl.c
index ede2ef1..1d02e32 100644
--- a/drivers/tty/vt/vt_ioctl.c
+++ b/drivers/tty/vt/vt_ioctl.c
@@ -110,16 +110,7 @@ void vt_event_post(unsigned int event, unsigned
int old, unsigned int new)
wake_up_interruptible(&vt_event_waitqueue);
}

-/**
- * vt_event_wait - wait for an event
- * @vw: our event
- *
- * Waits for an event to occur which completes our vt_event_wait
- * structure. On return the structure has wv->done set to 1 for success
- * or 0 if some event such as a signal ended the wait.
- */
-
-static void vt_event_wait(struct vt_event_wait *vw)
+static void __vt_event_queue(struct vt_event_wait *vw)
{
unsigned long flags;
/* Prepare the event */
@@ -129,8 +120,18 @@ static void vt_event_wait(struct vt_event_wait *vw)
spin_lock_irqsave(&vt_event_lock, flags);
list_add(&vw->list, &vt_events);
spin_unlock_irqrestore(&vt_event_lock, flags);
+}
+
+static void __vt_event_wait(struct vt_event_wait *vw)
+{
/* Wait for it to pass */
wait_event_interruptible(vt_event_waitqueue, vw->done);
+}
+
+static void __vt_event_dequeue(struct vt_event_wait *vw)
+{
+ unsigned long flags;
+
/* Dequeue it */
spin_lock_irqsave(&vt_event_lock, flags);
list_del(&vw->list);
@@ -138,6 +139,22 @@ static void vt_event_wait(struct vt_event_wait *vw)
}

/**
+ * vt_event_wait - wait for an event
+ * @vw: our event
+ *
+ * Waits for an event to occur which completes our vt_event_wait
+ * structure. On return the structure has wv->done set to 1 for success
+ * or 0 if some event such as a signal ended the wait.
+ */
+
+static void vt_event_wait(struct vt_event_wait *vw)
+{
+ __vt_event_queue(vw);
+ __vt_event_wait(vw);
+ __vt_event_dequeue(vw);
+}
+
+/**
* vt_event_wait_ioctl - event ioctl handler
* @arg: argument to ioctl
*
@@ -177,10 +194,14 @@ int vt_waitactive(int n)
{
struct vt_event_wait vw;
do {
- if (n == fg_console + 1)
- break;
vw.event.event = VT_EVENT_SWITCH;
- vt_event_wait(&vw);
+ __vt_event_queue(&vw);
+ if (n == fg_console + 1) {
+ __vt_event_dequeue(&vw);
+ break;
+ }
+ __vt_event_wait(&vw);
+ __vt_event_dequeue(&vw);
if (vw.done == 0)
return -EINTR;
} while (vw.event.newev != n);
--
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 [vger.kernel.org]
Please read the FAQ at [www.tux.org]

[Xen-devel] [PATCH] audio: split IN_T into two separate constants (no replies)

Roger Pau Monne — Fri, 18 May 2012 18:59:02 +0800

Split IN_T into BSIZE and ITYPE, to avoid expansion if the OS has
defined macros for the intX_t and uintX_t types. The IN_T constant is
then defined in mixeng_template.h so it can be used by the
functions/macros on this header file.

This change has been tested successfully under Debian Linux and NetBSD
6.0BETA.

Cc: Vassili Karpov (malc)
Signed-off-by: Roger Pau Monne
---
audio/mixeng.c | 36 ++++++++++++++++++++++++------------
audio/mixeng_template.h | 4 +++-
2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/audio/mixeng.c b/audio/mixeng.c
index 5446be6..02a9d9f 100644
--- a/audio/mixeng.c
+++ b/audio/mixeng.c
@@ -33,7 +33,8 @@
#define ENDIAN_CONVERT(v) (v)

/* Signed 8 bit */
-#define IN_T int8_t
+#define BSIZE 8
+#define ITYPE int
#define IN_MIN SCHAR_MIN
#define IN_MAX SCHAR_MAX
#define SIGNED
@@ -42,25 +43,29 @@
#undef SIGNED
#undef IN_MAX
#undef IN_MIN
-#undef IN_T
+#undef BSIZE
+#undef ITYPE
#undef SHIFT

/* Unsigned 8 bit */
-#define IN_T uint8_t
+#define BSIZE 8
+#define ITYPE uint
#define IN_MIN 0
#define IN_MAX UCHAR_MAX
#define SHIFT 8
#include "mixeng_template.h"
#undef IN_MAX
#undef IN_MIN
-#undef IN_T
+#undef BSIZE
+#undef ITYPE
#undef SHIFT

#undef ENDIAN_CONVERT
#undef ENDIAN_CONVERSION

/* Signed 16 bit */
-#define IN_T int16_t
+#define BSIZE 16
+#define ITYPE int
#define IN_MIN SHRT_MIN
#define IN_MAX SHRT_MAX
#define SIGNED
@@ -78,11 +83,13 @@
#undef SIGNED
#undef IN_MAX
#undef IN_MIN
-#undef IN_T
+#undef BSIZE
+#undef ITYPE
#undef SHIFT

/* Unsigned 16 bit */
-#define IN_T uint16_t
+#define BSIZE 16
+#define ITYPE uint
#define IN_MIN 0
#define IN_MAX USHRT_MAX
#define SHIFT 16
@@ -98,11 +105,13 @@
#undef ENDIAN_CONVERSION
#undef IN_MAX
#undef IN_MIN
-#undef IN_T
+#undef BSIZE
+#undef ITYPE
#undef SHIFT

/* Signed 32 bit */
-#define IN_T int32_t
+#define BSIZE 32
+#define ITYPE int
#define IN_MIN INT32_MIN
#define IN_MAX INT32_MAX
#define SIGNED
@@ -120,11 +129,13 @@
#undef SIGNED
#undef IN_MAX
#undef IN_MIN
-#undef IN_T
+#undef BSIZE
+#undef ITYPE
#undef SHIFT

/* Unsigned 32 bit */
-#define IN_T uint32_t
+#define BSIZE 32
+#define ITYPE uint
#define IN_MIN 0
#define IN_MAX UINT32_MAX
#define SHIFT 32
@@ -140,7 +151,8 @@
#undef ENDIAN_CONVERSION
#undef IN_MAX
#undef IN_MIN
-#undef IN_T
+#undef BSIZE
+#undef ITYPE
#undef SHIFT

t_sample *mixeng_conv[2][2][2][3] = {
diff --git a/audio/mixeng_template.h b/audio/mixeng_template.h
index e644c23..30849a6 100644
--- a/audio/mixeng_template.h
+++ b/audio/mixeng_template.h
@@ -31,7 +31,8 @@
#define HALF (IN_MAX >> 1)
#endif

-#define ET glue (ENDIAN_CONVERSION, glue (_, IN_T))
+#define ET glue (ENDIAN_CONVERSION, glue (glue (glue (_, ITYPE), BSIZE), _t))
+#define IN_T glue (glue (ITYPE, BSIZE), _t)

#ifdef FLOAT_MIXENG
static mixeng_real inline glue (conv_, ET) (IN_T v)
@@ -150,3 +151,4 @@ static void glue (glue (clip_, ET), _from_mono)

#undef ET
#undef HALF
+#undef IN_T
--
1.7.7.5 (Apple Git-26)

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
[lists.xen.org]

[tip:x86/mm] x86/tlb: Clean up and unify TLB_FLUSH_ALL definition (no replies)

tip-bot for Alex Shi — Fri, 18 May 2012 18:51:13 +0800

Commit-ID: 3e7f3db001de6133db1c385c92eec944409a8b4f
Gitweb: [git.kernel.org]
Author: Alex Shi
AuthorDate: Thu, 10 May 2012 18:01:59 +0800
Committer: Ingo Molnar
CommitDate: Fri, 18 May 2012 10:13:37 +0200

x86/tlb: Clean up and unify TLB_FLUSH_ALL definition

Since sizeof(long) is 4 in x86_32 mode, and it's 8 in x86_64
mode, sizeof(long long) is also 8 byte in x86_64 mode.
use long mode can fit TLB_FLUSH_ALL defination here both in 32
or 64 bits mode.

Signed-off-by: Alex Shi
Link: [lkml.kernel.org]
Signed-off-by: Ingo Molnar
---
arch/x86/include/asm/tlbflush.h | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h
index 169be89..63af909 100644
--- a/arch/x86/include/asm/tlbflush.h
+++ b/arch/x86/include/asm/tlbflush.h
@@ -62,11 +62,7 @@ static inline void __flush_tlb_one(unsigned long addr)
__flush_tlb();
}

-#ifdef CONFIG_X86_32
-# define TLB_FLUSH_ALL 0xffffffff
-#else
-# define TLB_FLUSH_ALL -1ULL
-#endif
+#define TLB_FLUSH_ALL -1UL

/*
* TLB flushing:
--
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 [vger.kernel.org]
Please read the FAQ at [www.tux.org]

[tip:sched/core] sched: Set TAINT_UNSAFE_SMP after sleep-in-atomic bug (2 replies)

tip-bot for Konstantin Khlebnikov — Fri, 18 May 2012 20:12:09 +0800

Commit-ID: 1d76f4381601a259323ad4faadce18db08ddebcd
Gitweb: [git.kernel.org]
Author: Konstantin Khlebnikov
AuthorDate: Thu, 17 May 2012 16:22:10 -0700
Committer: Ingo Molnar
CommitDate: Fri, 18 May 2012 09:51:08 +0200

sched: Set TAINT_UNSAFE_SMP after sleep-in-atomic bug

Usually sleep-in-atomic bugs are followed by dozens other
warnings. This patch should help to figure out original source
of problem. This taint flag also turns off lockdep, because it
can go mad after that.

Original TAINT_UNSAFE_SMP is used only on various ancient buggy
K7 Athlons. TAINT_UNSAFE_SMP is shown as 'S' in "Tainted" line,
so let it be acronym for SMP, Scheduler and Sleep-in-atomic.

Probably we should rename it into TAINT_SHIT, but TAINT_CRAP is
already there. =)

Signed-off-by: Konstantin Khlebnikov
Signed-off-by: Andrew Morton
Acked-by: Peter Zijlstra
Cc: Randy Dunlap
Link: [lkml.kernel.org]
Signed-off-by: Ingo Molnar
---
Documentation/oops-tracing.txt | 2 +-
Documentation/sysctl/kernel.txt | 1 +
kernel/sched/core.c | 1 +
3 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/Documentation/oops-tracing.txt b/Documentation/oops-tracing.txt
index 13032c0..ad9b9d8 100644
--- a/Documentation/oops-tracing.txt
+++ b/Documentation/oops-tracing.txt
@@ -237,7 +237,7 @@ characters, each representing a particular tainted value.
3: 'S' if the oops occurred on an SMP kernel running on hardware that
hasn't been certified as safe to run multiprocessor.
Currently this occurs only on various Athlons that are not
- SMP capable.
+ SMP capable. Also cpu scheduler sets this after sleep-in-atomic bug.

4: 'R' if a module was force unloaded by "rmmod -f", ' ' if all
modules were unloaded normally.
diff --git a/Documentation/sysctl/kernel.txt b/Documentation/sysctl/kernel.txt
index 6d78841..b573910 100644
--- a/Documentation/sysctl/kernel.txt
+++ b/Documentation/sysctl/kernel.txt
@@ -590,6 +590,7 @@ can be ORed together:
2 - A module was force loaded by insmod -f.
Set by modutils >= 2.4.9 and module-init-tools.
4 - Unsafe SMP processors: SMP with CPUs not designed for SMP.
+ Also cpu scheduler sets this after sleep-in-atomic bug.
8 - A module was forcibly unloaded from the system by rmmod -f.
16 - A hardware machine check error occurred on the system.
32 - A bad page was discovered on the system.
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 24ca677..b86eb50 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -3138,6 +3138,7 @@ static noinline void __schedule_bug(struct task_struct *prev)
if (irqs_disabled())
print_irqtrace_events(prev);
dump_stack();
+ add_taint(TAINT_UNSAFE_SMP);
}

/*
--
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 [vger.kernel.org]
Please read the FAQ at [www.tux.org]

[tip:sched/numa] sched/numa: Provide sysctl knob to disable numa scheduling and turn it off by default (no replies)

tip-bot for Peter Zijlstra — Fri, 18 May 2012 18:49:02 +0800

Commit-ID: bcdf5162b92dfc0999b0e0ecf25d778733cc4c4d
Gitweb: [git.kernel.org]
Author: Peter Zijlstra
AuthorDate: Thu, 17 May 2012 15:07:31 +0200
Committer: Ingo Molnar
CommitDate: Fri, 18 May 2012 09:48:59 +0200

sched/numa: Provide sysctl knob to disable numa scheduling and turn it off by default

Provide a knob to make all this numa scheduling go-away.

Also provide a Kconfig entry to set the default for this new knob.

Requested-by: Ingo Molnar
Signed-off-by: Peter Zijlstra
Cc: Linus Torvalds
Cc: Andrew Morton
Link: [lkml.kernel.org]
Signed-off-by: Ingo Molnar
---
include/linux/sched.h | 13 +++++++
init/Kconfig | 18 ++++++++++
kernel/sched/numa.c | 89 +++++++++++++++++++++++++++++++++++++++---------
kernel/sysctl.c | 11 ++++++
4 files changed, 114 insertions(+), 17 deletions(-)

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 024a5f9..4879103 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -90,6 +90,7 @@ struct sched_param {
#include
#include
#include
+#include

#include

@@ -1584,9 +1585,14 @@ struct task_struct {
/* Future-safe accessor for struct task_struct's cpus_allowed. */
#define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)

+extern struct static_key sched_numa_disabled;
+
static inline int tsk_home_node(struct task_struct *p)
{
#ifdef CONFIG_NUMA
+ if (static_key_false(&sched_numa_disabled))
+ return -1;
+
return p->node;
#else
return -1;
@@ -2058,6 +2064,13 @@ static inline void sched_autogroup_exit(struct signal_struct *sig) { }
extern unsigned int sysctl_sched_cfs_bandwidth_slice;
#endif

+#ifdef CONFIG_NUMA
+extern int sysctl_sched_numa;
+int sched_numa_handler(struct ctl_table *table, int write,
+ void __user *buffer, size_t *lenp,
+ loff_t *ppos);
+#endif
+
#ifdef CONFIG_RT_MUTEXES
extern int rt_mutex_getprio(struct task_struct *p);
extern void rt_mutex_setprio(struct task_struct *p, int prio);
diff --git a/init/Kconfig b/init/Kconfig
index e4e84f2..2f6bfc1 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -865,6 +865,24 @@ config SCHED_AUTOGROUP
desktop applications. Task group autogeneration is currently based
upon task session.

+config SCHED_NUMA_DEFAULT
+ bool "Enable NUMA scheduling by default"
+ depends on NUMA
+ default n
+ help
+ This option selects the default enablement of a scheduler feature
+ that gives each process a home-node and allocates all its memory
+ from there and tries to schedule all the process tasks on that node
+ (or as near to it) while trying to maintain fairness.
+
+ Without this feature memory is allocated on whatever node a task
+ happens to run on and the scheduler is free to migrate tasks around
+ at will -- which can result in significant cross-node memory
+ traffic.
+
+ Regardless of this setting it can always be changed at runtime
+ by changing /proc/sys/kernel/sched_numa.
+
config MM_OWNER
def_bool NUMA

diff --git a/kernel/sched/numa.c b/kernel/sched/numa.c
index 7b74a15..b98338b 100644
--- a/kernel/sched/numa.c
+++ b/kernel/sched/numa.c
@@ -18,6 +18,9 @@

#include "sched.h"

+struct static_key sched_numa_disabled = STATIC_KEY_INIT_FALSE;
+static DEFINE_MUTEX(sched_numa_mutex);
+int sysctl_sched_numa = IS_ENABLED(CONFIG_SCHED_NUMA_DEFAULT);

static const int numa_balance_interval = 2 * HZ; /* 2 seconds */

@@ -137,7 +140,7 @@ bool account_numa_enqueue(struct task_struct *p)

void account_numa_dequeue(struct task_struct *p)
{
- int home_node = tsk_home_node(p);
+ int home_node = p->node; /* ignore sched_numa_disabled */
struct numa_cpu_load *nl;
struct rq *rq;

@@ -444,7 +447,7 @@ void select_task_node(struct task_struct *p, struct mm_struct *mm, int sd_flags)
{
int node;

- if (!sched_feat(NUMA_SELECT)) {
+ if (!sched_feat(NUMA_SELECT) || !sysctl_sched_numa) {
p->node = -1;
return;
}
@@ -766,13 +769,74 @@ static int numad_thread(void *data)
return 0;
}

+static int numad_create(struct node_queue *nq)
+{
+ struct task_struct *numad;
+
+ if (!sysctl_sched_numa)
+ return 0;
+
+ numad = kthread_create_on_node(numad_thread,
+ nq, nq->node, "numad/%d", nq->node);
+ if (IS_ERR(numad))
+ return PTR_ERR(numad);
+
+ nq->numad = numad;
+ nq->next_schedule = jiffies + HZ;
+
+ return 0;
+}
+
+static void numad_destroy(struct node_queue *nq)
+{
+ kthread_stop(nq->numad);
+ nq->numad = NULL;
+}
+
+int sched_numa_handler(struct ctl_table *table, int write,
+ void __user *buffer, size_t *lenp,
+ loff_t *ppos)
+{
+ int old, new, ret, node;
+
+ mutex_lock(&sched_numa_mutex);
+ get_online_cpus();
+
+ old = sysctl_sched_numa;
+ ret = proc_dointvec_minmax(table, write, buffer, lenp, ppos);
+ new = sysctl_sched_numa;
+
+ if (old == new)
+ goto unlock;
+
+ if (new)
+ static_key_slow_dec(&sched_numa_disabled);
+ else
+ static_key_slow_inc(&sched_numa_disabled);
+
+ for_each_online_node(node) {
+ struct node_queue *nq = nq_of(node);
+
+ if (new && !nq->numad) {
+ if (!numad_create(nq))
+ wake_up_process(nq->numad);
+ } else if (!new && nq->numad)
+ numad_destroy(nq);
+ }
+
+unlock:
+ put_online_cpus();
+ mutex_unlock(&sched_numa_mutex);
+
+ return ret;
+}
+
static int __cpuinit
numa_hotplug(struct notifier_block *nb, unsigned long action, void *hcpu)
{
int cpu = (long)hcpu;
int node = cpu_to_node(cpu);
struct node_queue *nq = nq_of(node);
- struct task_struct *numad;
int err = 0;

switch (action & ~CPU_TASKS_FROZEN) {
@@ -780,19 +844,12 @@ numa_hotplug(struct notifier_block *nb, unsigned long action, void *hcpu)
if (nq->numad)
break;

- numad = kthread_create_on_node(numad_thread,
- nq, node, "numad/%d", node);
- if (IS_ERR(numad)) {
- err = PTR_ERR(numad);
- break;
- }
-
- nq->numad = numad;
- nq->next_schedule = jiffies + HZ; // XXX sync-up?
+ err = numad_create(nq);
break;

case CPU_ONLINE:
- wake_up_process(nq->numad);
+ if (nq->numad)
+ wake_up_process(nq->numad);
break;

case CPU_DEAD:
@@ -801,10 +858,8 @@ numa_hotplug(struct notifier_block *nb, unsigned long action, void *hcpu)
break;

if (cpumask_any_and(cpu_online_mask,
- cpumask_of_node(node)) >= nr_cpu_ids) {
- kthread_stop(nq->numad);
- nq->numad = NULL;
- }
+ cpumask_of_node(node)) >= nr_cpu_ids)
+ numad_destroy(nq);
break;
}

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 4ab1187..40ecba2 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -373,6 +373,17 @@ static struct ctl_table kern_table[] = {
.extra1 = &one,
},
#endif
+#ifdef CONFIG_NUMA
+ {
+ .procname = "sched_numa",
+ .data = &sysctl_sched_numa,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = sched_numa_handler,
+ .extra1 = &zero,
+ .extra2 = &one,
+ },
+#endif
#ifdef CONFIG_PROVE_LOCKING
{
.procname = "prove_locking",
--
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 [vger.kernel.org]
Please read the FAQ at [www.tux.org]

[tip:x86/apic] x86/xen/apic: Add missing #include (no replies)

tip-bot for Ingo Molnar — Fri, 18 May 2012 18:46:11 +0800

Commit-ID: 87e4baacaeba098e217b14e9d2f6af428fe3f657
Gitweb: [git.kernel.org]
Author: Ingo Molnar
AuthorDate: Fri, 18 May 2012 09:34:45 +0200
Committer: Ingo Molnar
CommitDate: Fri, 18 May 2012 09:34:45 +0200

x86/xen/apic: Add missing #include

This file depends on , but the dependency was hidden due
to: -> -> ->

With the removal of , this exposed the missing

Cc: Len Brown
Cc: Konrad Rzeszutek Wilk
Cc: Jeremy Fitzhardinge
Cc: Jarkko Sakkinen
Cc: H. Peter Anvin
Link: [lkml.kernel.org]
Signed-off-by: Ingo Molnar
---
arch/x86/xen/apic.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/arch/x86/xen/apic.c b/arch/x86/xen/apic.c
index 1913bf2..ec57bd3 100644
--- a/arch/x86/xen/apic.c
+++ b/arch/x86/xen/apic.c
@@ -1,9 +1,12 @@
#include
+
#include
#include
-#include
#include

+#include
+#include
+
unsigned int xen_io_apic_read(unsigned apic, unsigned reg)
{
struct physdev_apic apic_op;
--
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 [vger.kernel.org]
Please read the FAQ at [www.tux.org]

[tip:sched/numa] mm: Optimize numa_group RSS accounting (no replies)

tip-bot for Peter Zijlstra — Fri, 18 May 2012 18:44:03 +0800

Commit-ID: c9d90e77f23a1778812e470d48a0be802a8cd4d9
Gitweb: [git.kernel.org]
Author: Peter Zijlstra
AuthorDate: Wed, 16 May 2012 15:11:26 +0200
Committer: Ingo Molnar
CommitDate: Fri, 18 May 2012 08:16:27 +0200

mm: Optimize numa_group RSS accounting

Move all relevant data structures into mm_types.h so that mm.h can
access the numa_group::rss fields avoiding the out of line call.

Also wrap the whole thing in a jump-label so as to avoid the
conditionals when there aren't any numa groups around (the normal
case).

This should remove most of the cost added to RSS accounting by the
numa group stuff when that's unused.

Signed-off-by: Peter Zijlstra
Cc: Suresh Siddha
Cc: Paul Turner
Cc: Dan Smith
Cc: Bharata B Rao
Cc: Lee Schermerhorn
Cc: Christoph Lameter
Cc: Rik van Riel
Cc: Andrea Arcangeli
Cc: Andrew Morton
Cc: Linus Torvalds
Link: [lkml.kernel.org]
Signed-off-by: Ingo Molnar
---
include/linux/mempolicy.h | 45 +--------------------
include/linux/mm.h | 16 ++++++-
include/linux/mm_types.h | 100 ++++++++++++++++++++++++++++++++++++---------
kernel/sched/numa.c | 35 +++-------------
4 files changed, 101 insertions(+), 95 deletions(-)

diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h
index 6e1029f..f5db168 100644
--- a/include/linux/mempolicy.h
+++ b/include/linux/mempolicy.h
@@ -81,52 +81,9 @@ enum mpol_rebind_step {
#include
#include
#include
-
-struct mm_struct;
+#include

#ifdef CONFIG_NUMA
-
-/*
- * Describe a memory policy.
- *
- * A mempolicy can be either associated with a process or with a VMA.
- * For VMA related allocations the VMA policy is preferred, otherwise
- * the process policy is used. Interrupts ignore the memory policy
- * of the current process.
- *
- * Locking policy for interlave:
- * In process context there is no locking because only the process accesses
- * its own state. All vma manipulation is somewhat protected by a down_read on
- * mmap_sem.
- *
- * Freeing policy:
- * Mempolicy objects are reference counted. A mempolicy will be freed when
- * mpol_put() decrements the reference count to zero.
- *
- * Duplicating policy objects:
- * mpol_dup() allocates a new mempolicy and copies the specified mempolicy
- * to the new storage. The reference count of the new object is initialized
- * to 1, representing the caller of mpol_dup().
- */
-struct mempolicy {
- atomic_t refcnt;
- unsigned short mode; /* See MPOL_* above */
- unsigned short flags; /* See set_mempolicy() MPOL_F_* above */
- struct numa_group *numa_group;
- struct list_head ng_entry;
- struct vm_area_struct *vma;
- struct rcu_head rcu;
- union {
- short preferred_node; /* preferred */
- nodemask_t nodes; /* interleave/bind */
- /* undefined for default */
- } v;
- union {
- nodemask_t cpuset_mems_allowed; /* relative to these nodes */
- nodemask_t user_nodemask; /* nodemask passed by user */
- } w;
-};
-
/*
* Support for managing mempolicy data objects (clone, copy, destroy)
* The default fast path of a NULL MPOL_DEFAULT policy is always inlined.
diff --git a/include/linux/mm.h b/include/linux/mm.h
index eda8271..96ef84c 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1077,13 +1077,23 @@ static inline unsigned long get_mm_counter(struct mm_struct *mm, int member)
}

#ifdef CONFIG_NUMA
-extern void __numa_add_rss_counter(struct vm_area_struct *, int, long);
+#include
+
+extern struct static_key sched_numa_groups;

static inline
void numa_add_rss_counter(struct vm_area_struct *vma, int member, long value)
{
- if (vma->vm_policy) /* XXX sodding include dependecies */
- __numa_add_rss_counter(vma, member, value);
+ if (static_key_false(&sched_numa_groups) &&
+ vma->vm_policy && vma->vm_policy->numa_group) {
+ /*
+ * Since the caller passes the vma argument, the caller is
+ * responsible for making sure the vma is stable, hence the
+ * ->vm_policy->numa_group dereference is safe. (caller usually
+ * has vma->vm_mm->mmap_sem for reading).
+ */
+ atomic_long_add(value, &vma->vm_policy->numa_group->rss.count[member]);
+ }
}
#else /* !CONFIG_NUMA */
static inline void numa_add_rss_counter(struct vm_area_struct *vma, int member, long value) { }
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
index 9b98193..ee48fe3 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@ -191,6 +191,87 @@ struct vm_region {
* this region */
};

+enum {
+ MM_FILEPAGES,
+ MM_ANONPAGES,
+ MM_SWAPENTS,
+ NR_MM_COUNTERS
+};
+
+struct mm_rss_stat {
+ atomic_long_t count[NR_MM_COUNTERS];
+};
+
+struct numa_entity {
+#ifdef CONFIG_NUMA
+ int node; /* home node */
+ struct list_head numa_entry; /* balance list */
+ const struct numa_ops *nops;
+#endif
+};
+
+#ifdef CONFIG_NUMA
+#include
+
+struct numa_group {
+ spinlock_t lock;
+ int id;
+
+ struct mm_rss_stat rss;
+
+ struct list_head tasks;
+ struct list_head vmas;
+
+ const struct cred *cred;
+ atomic_t ref;
+
+ struct numa_entity numa_entity;
+
+ struct rcu_head rcu;
+};
+
+/*
+ * Describe a memory policy.
+ *
+ * A mempolicy can be either associated with a process or with a VMA.
+ * For VMA related allocations the VMA policy is preferred, otherwise
+ * the process policy is used. Interrupts ignore the memory policy
+ * of the current process.
+ *
+ * Locking policy for interlave:
+ * In process context there is no locking because only the process accesses
+ * its own state. All vma manipulation is somewhat protected by a down_read on
+ * mmap_sem.
+ *
+ * Freeing policy:
+ * Mempolicy objects are reference counted. A mempolicy will be freed when
+ * mpol_put() decrements the reference count to zero.
+ *
+ * Duplicating policy objects:
+ * mpol_dup() allocates a new mempolicy and copies the specified mempolicy
+ * to the new storage. The reference count of the new object is initialized
+ * to 1, representing the caller of mpol_dup().
+ */
+struct mempolicy {
+ atomic_t refcnt;
+ unsigned short mode; /* See MPOL_* above */
+ unsigned short flags; /* See set_mempolicy() MPOL_F_* above */
+ struct numa_group *numa_group;
+ struct list_head ng_entry;
+ struct vm_area_struct *vma;
+ struct rcu_head rcu;
+ union {
+ short preferred_node; /* preferred */
+ nodemask_t nodes; /* interleave/bind */
+ /* undefined for default */
+ } v;
+ union {
+ nodemask_t cpuset_mems_allowed; /* relative to these nodes */
+ nodemask_t user_nodemask; /* nodemask passed by user */
+ } w;
+};
+#endif /* CONFIG_NUMA */
+
/*
* This struct defines a memory VMM memory area. There is one of these
* per VM-area/task. A VM area is any part of the process virtual memory
@@ -265,13 +346,6 @@ struct core_state {
struct completion startup;
};

-enum {
- MM_FILEPAGES,
- MM_ANONPAGES,
- MM_SWAPENTS,
- NR_MM_COUNTERS
-};
-
#if USE_SPLIT_PTLOCKS && defined(CONFIG_MMU)
#define SPLIT_RSS_COUNTING
/* per-thread cached information, */
@@ -281,18 +355,6 @@ struct task_rss_stat {
};
#endif /* USE_SPLIT_PTLOCKS */

-struct mm_rss_stat {
- atomic_long_t count[NR_MM_COUNTERS];
-};
-
-struct numa_entity {
-#ifdef CONFIG_NUMA
- int node; /* home node */
- struct list_head numa_entry; /* balance list */
- const struct numa_ops *nops;
-#endif
-};
-
struct mm_struct {
struct vm_area_struct * mmap; /* list of VMAs */
struct rb_root mm_rb;
diff --git a/kernel/sched/numa.c b/kernel/sched/numa.c
index af123aa..7b74a15 100644
--- a/kernel/sched/numa.c
+++ b/kernel/sched/numa.c
@@ -853,23 +853,6 @@ early_initcall(numa_init);
#include
#include

-struct numa_group {
- spinlock_t lock;
- int id;
-
- struct mm_rss_stat rss;
-
- struct list_head tasks;
- struct list_head vmas;
-
- const struct cred *cred;
- atomic_t ref;
-
- struct numa_entity numa_entity;
-
- struct rcu_head rcu;
-};
-
static struct srcu_struct ng_srcu;

static DEFINE_MUTEX(numa_group_idr_lock);
@@ -898,6 +881,8 @@ static void __ng_put_rcu(struct rcu_head *rcu)
kfree(ng);
}

+struct static_key sched_numa_groups = STATIC_KEY_INIT_FALSE;
+
static void __ng_put(struct numa_group *ng)
{
mutex_lock(&numa_group_idr_lock);
@@ -909,6 +894,8 @@ static void __ng_put(struct numa_group *ng)

dequeue_ne(&ng->numa_entity);

+ static_key_slow_dec(&sched_numa_groups);
+
call_rcu(&ng->rcu, __ng_put_rcu);
}

@@ -1123,18 +1110,6 @@ void numa_vma_link(struct vm_area_struct *new, struct vm_area_struct *old)
spin_unlock(&ng->lock);
}

-void __numa_add_rss_counter(struct vm_area_struct *vma, int member, long value)
-{
- /*
- * Since the caller passes the vma argument, the caller is responsible
- * for making sure the vma is stable, hence the ->vm_policy->numa_group
- * dereference is safe. (caller usually has vma->vm_mm->mmap_sem for
- * reading).
- */
- if (vma->vm_policy->numa_group)
- atomic_long_add(value, &vma->vm_policy->numa_group->rss.count[member]);
-}
-
static void __mpol_put_rcu(struct rcu_head *rcu)
{
struct mempolicy *mpol = container_of(rcu, struct mempolicy, rcu);
@@ -1197,6 +1172,8 @@ static struct numa_group *ng_create(struct task_struct *p)
if (err)
goto fail_alloc;

+ static_key_slow_inc(&sched_numa_groups);
+
spin_lock_init(&ng->lock);
atomic_set(&ng->ref, 1);
ng->cred = get_task_cred(p);
--
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 [vger.kernel.org]
Please read the FAQ at [www.tux.org]