---- linux-2.6.32/drivers/infiniband/Kconfig~ 2009-12-05 00:26:03.663774916 +0100
-+++ linux-2.6.32/drivers/infiniband/Kconfig 2009-12-05 00:26:05.914179759 +0100
-@@ -37,7 +37,6 @@
- config INFINIBAND_ADDR_TRANS
- bool
- depends on INET
-- depends on !(INFINIBAND = y && IPV6 = m)
- default y
-
- source "drivers/infiniband/hw/mthca/Kconfig"
--- linux-2.6.33/scripts/mod/modpost.c~ 2010-02-24 19:52:17.000000000 +0100
+++ linux-2.6.33/scripts/mod/modpost.c 2010-03-07 14:26:47.242168558 +0100
@@ -15,7 +15,8 @@
/* Some toolchains use a `_' prefix for all user symbols. */
-commit 87b09f1f25cd1e01d7c50bf423c7fe33027d7511
-Author: stephen hemminger <shemminger@vyatta.com>
-Date: Fri Feb 12 06:58:00 2010 +0000
-
- sky2: dont enable PME legacy mode
-
- This bit is not changed by vendor driver, and should be left alone.
- The documentation implies this a debug bit.
- 0 = WAKE# only asserted when VMAIN not available
- 1 = WAKE# is depend on wake events and independent of VMAIN.
-
- Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
- Signed-off-by: David S. Miller <davem@davemloft.net>
-
-diff --git b/drivers/net/sky2.c a/drivers/net/sky2.c
-index 2494842..edf37aa 100644
---- b/drivers/net/sky2.c
-+++ a/drivers/net/sky2.c
-@@ -733,6 +733,7 @@ static void sky2_wol_init(struct sky2_port *sky2)
- unsigned port = sky2->port;
- enum flow_control save_mode;
- u16 ctrl;
-+ u32 reg1;
-
- /* Bring hardware out of reset */
- sky2_write16(hw, B0_CTST, CS_RST_CLR);
-@@ -786,6 +787,11 @@ static void sky2_wol_init(struct sky2_port *sky2)
- /* Disable PiG firmware */
- sky2_write16(hw, B0_CTST, Y2_HW_WOL_OFF);
-
-+ /* Turn on legacy PCI-Express PME mode */
-+ reg1 = sky2_pci_read32(hw, PCI_DEV_REG1);
-+ reg1 |= PCI_Y2_PME_LEGACY;
-+ sky2_pci_write32(hw, PCI_DEV_REG1, reg1);
-+
- /* block receiver */
- sky2_write8(hw, SK_REG(port, RX_GMF_CTRL_T), GMF_RST_SET);
- }
-On Sat, 2 Jul 2011, Andi Kleen wrote:
-
-> > The problem is that blk_peek_request() calls scsi_prep_fn(), which
-> > does this:
-> >
-> > struct scsi_device *sdev = q->queuedata;
-> > int ret = BLKPREP_KILL;
-> >
-> > if (req->cmd_type == REQ_TYPE_BLOCK_PC)
-> > ret = scsi_setup_blk_pc_cmnd(sdev, req);
-> > return scsi_prep_return(q, req, ret);
-> >
-> > It doesn't check to see if sdev is NULL, nor does
-> > scsi_setup_blk_pc_cmnd(). That accounts for this error:
->
-> I actually added a NULL check in scsi_setup_blk_pc_cmnd early on,
-> but that just caused RCU CPU stalls afterwards and then eventually
-> a hung system.
-
-The RCU problem is likely to be a separate issue. It might even be a
-result of the use-after-free problem with the elevator.
-
-At any rate, it's clear that the crash in the refcounting log you
-posted occurred because scsi_setup_blk_pc_cmnd() called
-scsi_prep_state_check(), which tried to dereference the NULL pointer.
-
-Would you like to try this patch to see if it fixes the problem? As I
-said before, I'm not certain it's the best thing to do, but it worked
-on my system.
-
-Alan Stern
-
-
-
-
-Index: usb-3.0/drivers/scsi/scsi_lib.c
-===================================================================
---- usb-3.0.orig/drivers/scsi/scsi_lib.c
-+++ usb-3.0/drivers/scsi/scsi_lib.c
-@@ -1247,6 +1247,8 @@ int scsi_prep_fn(struct request_queue *q
- struct scsi_device *sdev = q->queuedata;
- int ret = BLKPREP_KILL;
-
-+ if (!sdev)
-+ return ret;
- if (req->cmd_type == REQ_TYPE_BLOCK_PC)
- ret = scsi_setup_blk_pc_cmnd(sdev, req);
- return scsi_prep_return(q, req, ret);
-Index: usb-3.0/drivers/scsi/scsi_sysfs.c
-===================================================================
---- usb-3.0.orig/drivers/scsi/scsi_sysfs.c
-+++ usb-3.0/drivers/scsi/scsi_sysfs.c
-@@ -322,6 +322,8 @@ static void scsi_device_dev_release_user
- kfree(evt);
- }
-
-+ /* Freeing the queue signals to block that we're done */
-+ scsi_free_queue(sdev->request_queue);
- blk_put_queue(sdev->request_queue);
- /* NULL queue means the device can't be used */
- sdev->request_queue = NULL;
-@@ -936,8 +938,6 @@ void __scsi_remove_device(struct scsi_de
- /* cause the request function to reject all I/O requests */
- sdev->request_queue->queuedata = NULL;
-
-- /* Freeing the queue signals to block that we're done */
-- scsi_free_queue(sdev->request_queue);
- put_device(dev);
- }
-
-
-
---
-To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
-the body of a message to majordomo@vger.kernel.org
-More majordomo info at http://vger.kernel.org/majordomo-info.html
-Please read the FAQ at http://www.tux.org/lkml/
--- linux-3.0/scripts/kconfig/lxdialog/check-lxdialog.sh~ 2011-07-22 04:17:23.000000000 +0200
+++ linux-3.0/scripts/kconfig/lxdialog/check-lxdialog.sh 2011-08-25 21:26:04.799150642 +0200
@@ -9,6 +9,12 @@
fi
done
-
-
->From 4467601416e23740fc940c31b1fffacbcb69b4a0 Mon Sep 17 00:00:00 2001
-From: Corey Minyard <cminyard@mvista.com>
-Date: Mon, 21 Nov 2011 14:26:20 -0600
-Subject: [PATCH] ipmi_watchdog: Restore settings when BMC reset
-
-If the BMC gets reset, it will return 0x80 response errors. In this case,
-it is probably a good idea to restore the IPMI settings.
----
- drivers/char/ipmi/ipmi_watchdog.c | 41 ++++++++++++++++++++++++++++++++++--
- 1 files changed, 38 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_watchdog.c
-index c2917ffa..34767a6 100644
---- a/drivers/char/ipmi/ipmi_watchdog.c
-+++ b/drivers/char/ipmi/ipmi_watchdog.c
-@@ -139,6 +139,8 @@
- #define IPMI_WDOG_SET_TIMER 0x24
- #define IPMI_WDOG_GET_TIMER 0x25
-
-+#define IPMI_WDOG_TIMER_NOT_INIT_RESP 0x80
-+
- /* These are here until the real ones get into the watchdog.h interface. */
- #ifndef WDIOC_GETTIMEOUT
- #define WDIOC_GETTIMEOUT _IOW(WATCHDOG_IOCTL_BASE, 20, int)
-@@ -596,6 +598,7 @@ static int ipmi_heartbeat(void)
- struct kernel_ipmi_msg msg;
- int rv;
- struct ipmi_system_interface_addr addr;
-+ int timeout_retries = 0;
-
- if (ipmi_ignore_heartbeat)
- return 0;
-@@ -616,6 +619,7 @@ static int ipmi_heartbeat(void)
-
- mutex_lock(&heartbeat_lock);
-
-+restart:
- atomic_set(&heartbeat_tofree, 2);
-
- /*
-@@ -653,7 +657,33 @@ static int ipmi_heartbeat(void)
- /* Wait for the heartbeat to be sent. */
- wait_for_completion(&heartbeat_wait);
-
-- if (heartbeat_recv_msg.msg.data[0] != 0) {
-+ if (heartbeat_recv_msg.msg.data[0] == IPMI_WDOG_TIMER_NOT_INIT_RESP) {
-+ timeout_retries++;
-+ if (timeout_retries > 3) {
-+ printk(KERN_ERR PFX ": Unable to restore the IPMI"
-+ " watchdog's settings, giving up.\n");
-+ rv = -EIO;
-+ goto out_unlock;
-+ }
-+
-+ /*
-+ * The timer was not initialized, that means the BMC was
-+ * probably reset and lost the watchdog information. Attempt
-+ * to restore the timer's info. Note that we still hold
-+ * the heartbeat lock, to keep a heartbeat from happening
-+ * in this process, so must say no heartbeat to avoid a
-+ * deadlock on this mutex.
-+ */
-+ rv = ipmi_set_timeout(IPMI_SET_TIMEOUT_NO_HB);
-+ if (rv) {
-+ printk(KERN_ERR PFX ": Unable to send the command to"
-+ " set the watchdog's settings, giving up.\n");
-+ goto out_unlock;
-+ }
+diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
+index 7a0c800..ec5ebbb 100644
+--- a/drivers/net/ethernet/realtek/r8169.c
++++ b/drivers/net/ethernet/realtek/r8169.c
+@@ -6927,6 +6927,14 @@ rtl_init_one(struct pci_dev *pdev, const
+ for (i = 0; i < ETH_ALEN; i++)
+ dev->dev_addr[i] = RTL_R8(MAC0 + i);
+
++ if (!is_valid_ether_addr(dev->dev_addr)) {
++ /* Report it and use a random ethernet address instead */
++ netdev_err(dev, "Invalid MAC address: %pM\n", dev->dev_addr);
++ random_ether_addr(dev->dev_addr);
++ netdev_info(dev, "Using random MAC address: %pM\n",
++ dev->dev_addr);
++ }
+
-+ /* We might need a new heartbeat, so do it now */
-+ goto restart;
-+ } else if (heartbeat_recv_msg.msg.data[0] != 0) {
- /*
- * Got an error in the heartbeat response. It was already
- * reported in ipmi_wdog_msg_handler, but we should return
-@@ -662,6 +692,7 @@ static int ipmi_heartbeat(void)
- rv = -EINVAL;
- }
-
-+out_unlock:
- mutex_unlock(&heartbeat_lock);
+ SET_ETHTOOL_OPS(dev, &rtl8169_ethtool_ops);
+ dev->watchdog_timeo = RTL8169_TX_TIMEOUT;
- return rv;
-@@ -922,11 +953,15 @@ static struct miscdevice ipmi_wdog_miscdev = {
- static void ipmi_wdog_msg_handler(struct ipmi_recv_msg *msg,
- void *handler_data)
- {
-- if (msg->msg.data[0] != 0) {
-+ if (msg->msg.cmd == IPMI_WDOG_RESET_TIMER &&
-+ msg->msg.data[0] == IPMI_WDOG_TIMER_NOT_INIT_RESP)
-+ printk(KERN_INFO PFX "response: The IPMI controller appears"
-+ " to have been reset, will attempt to reinitialize"
-+ " the watchdog timer\n");
-+ else if (msg->msg.data[0] != 0)
- printk(KERN_ERR PFX "response: Error %x on cmd %x\n",
- msg->msg.data[0],
- msg->msg.cmd);
-- }
-
- ipmi_free_recv_msg(msg);
- }
---
-1.7.4.1
-
-From: Christoph Hellwig <hch@lst.de>
-Date: Tue, 29 Nov 2011 18:06:14 +0000 (-0600)
-Subject: xfs: force buffer writeback before blocking on the ilock in inode reclaim
-X-Git-Url: http://oss.sgi.com/cgi-bin/gitweb.cgi?p=xfs%2Fxfs.git;a=commitdiff_plain;h=4dd2cb4a28b7ab1f37163a4eba280926a13a8749
+[PATCH] SCSI: Don't attempt to send extended INQUIRY command if skip_vpd_pages is set
-xfs: force buffer writeback before blocking on the ilock in inode reclaim
+If a device has the skip_vpd_pages flag set we should simply fail the
+scsi_get_vpd_page() call.
-If we are doing synchronous inode reclaim we block the VM from making
-progress in memory reclaim. So if we encouter a flush locked inode
-promote it in the delwri list and wake up xfsbufd to write it out now.
-Without this we can get hangs of up to 30 seconds during workloads hitting
-synchronous inode reclaim.
+Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+Acked-by: Alan Stern <stern@rowland.harvard.edu>
+Tested-by: Stuart Foster <smf.linux@ntlworld.com>
+Cc: stable@vger.kernel.org
-The scheme is copied from what we do for dquot reclaims.
-
-Reported-by: Simon Kirby <sim@hostway.ca>
-Signed-off-by: Christoph Hellwig <hch@lst.de>
-Tested-by: Simon Kirby <sim@hostway.ca>
-Signed-off-by: Ben Myers <bpm@sgi.com>
----
-
-diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
-index c0237c6..755ee81 100644
---- a/fs/xfs/xfs_inode.c
-+++ b/fs/xfs/xfs_inode.c
-@@ -2835,6 +2835,27 @@ corrupt_out:
- return XFS_ERROR(EFSCORRUPTED);
- }
+diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
+index 3b1ea34..eaa808e 100644
+--- a/drivers/scsi/scsi.c
++++ b/drivers/scsi/scsi.c
+@@ -1031,6 +1031,9 @@
+ {
+ int i, result;
-+void
-+xfs_promote_inode(
-+ struct xfs_inode *ip)
-+{
-+ struct xfs_buf *bp;
++ if (sdev->skip_vpd_pages)
++ goto fail;
+
-+ ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL|XFS_ILOCK_SHARED));
-+
-+ bp = xfs_incore(ip->i_mount->m_ddev_targp, ip->i_imap.im_blkno,
-+ ip->i_imap.im_len, XBF_TRYLOCK);
-+ if (!bp)
-+ return;
-+
-+ if (XFS_BUF_ISDELAYWRITE(bp)) {
-+ xfs_buf_delwri_promote(bp);
-+ wake_up_process(ip->i_mount->m_ddev_targp->bt_task);
-+ }
-+
-+ xfs_buf_relse(bp);
-+}
-+
- /*
- * Return a pointer to the extent record at file index idx.
- */
-diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h
-index 760140d..b4cd473 100644
---- a/fs/xfs/xfs_inode.h
-+++ b/fs/xfs/xfs_inode.h
-@@ -498,6 +498,7 @@ int xfs_iunlink(struct xfs_trans *, xfs_inode_t *);
- void xfs_iext_realloc(xfs_inode_t *, int, int);
- void xfs_iunpin_wait(xfs_inode_t *);
- int xfs_iflush(xfs_inode_t *, uint);
-+void xfs_promote_inode(struct xfs_inode *);
- void xfs_lock_inodes(xfs_inode_t **, int, uint);
- void xfs_lock_two_inodes(xfs_inode_t *, xfs_inode_t *, uint);
+ /* Ask for all the pages supported by this device */
+ result = scsi_vpd_inquiry(sdev, buf, 0, buf_len);
+ if (result)
+commit 4d0ed18277cc6f07513ee0b04475f19cd69e75ef
+Author: Peter Hurley <peter@hurleysoftware.com>
+Date: Tue Dec 10 17:12:02 2013 -0500
+
+ n_tty: Fix buffer overruns with larger-than-4k pastes
+
+ readline() inadvertently triggers an error recovery path when
+ pastes larger than 4k overrun the line discipline buffer. The
+ error recovery path discards input when the line discipline buffer
+ is full and operating in canonical mode and no newline has been
+ received. Because readline() changes the termios to non-canonical
+ mode to read the line char-by-char, the line discipline buffer
+ can become full, and then when readline() restores termios back
+ to canonical mode for the caller, the now-full line discipline
+ buffer triggers the error recovery.
+
+ When changing termios from non-canon to canon mode and the read
+ buffer contains data, simulate an EOF push _without_ the
+ DISABLED_CHAR in the read buffer.
+
+ Importantly for the readline() problem, the termios can be
+ changed back to non-canonical mode without changes to the read
+ buffer occurring; ie., as if the previous termios change had not
+ happened (as long as no intervening read took place).
+
+ Preserve existing userspace behavior which allows '\0's already
+ received in non-canon mode to be read as '\0's in canon mode
+ (rather than trigger add'l EOF pushes or an actual EOF).
+
+ Patch based on original proposal and discussion here
+ https://bugzilla.kernel.org/show_bug.cgi?id=55991
+ by Stas Sergeev <stsp@users.sourceforge.net>
+
+ Reported-by: Margarita Manterola <margamanterola@gmail.com>
+ Cc: Maximiliano Curia <maxy@gnuservers.com.ar>
+ Cc: Pavel Machek <pavel@ucw.cz>
+ Cc: Arkadiusz Miskiewicz <a.miskiewicz@gmail.com>
+ Acked-by: Stas Sergeev <stsp@users.sourceforge.net>
+ Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
+index fdc2ecd..961e6a9 100644
+--- a/drivers/tty/n_tty.c
++++ b/drivers/tty/n_tty.c
+@@ -104,6 +104,7 @@ struct n_tty_data {
+
+ /* must hold exclusive termios_rwsem to reset these */
+ unsigned char lnext:1, erasing:1, raw:1, real_raw:1, icanon:1;
++ unsigned char push:1;
+
+ /* shared by producer and consumer */
+ char read_buf[N_TTY_BUF_SIZE];
+@@ -341,6 +342,7 @@ static void reset_buffer_flags(struct n_tty_data *ldata)
+
+ ldata->erasing = 0;
+ bitmap_zero(ldata->read_flags, N_TTY_BUF_SIZE);
++ ldata->push = 0;
+ }
-diff --git a/fs/xfs/xfs_sync.c b/fs/xfs/xfs_sync.c
-index aa3dc1a..be5c51d 100644
---- a/fs/xfs/xfs_sync.c
-+++ b/fs/xfs/xfs_sync.c
-@@ -770,6 +770,17 @@ restart:
- if (!xfs_iflock_nowait(ip)) {
- if (!(sync_mode & SYNC_WAIT))
- goto out;
-+
-+ /*
-+ * If we only have a single dirty inode in a cluster there is
-+ * a fair chance that the AIL push may have pushed it into
-+ * the buffer, but xfsbufd won't touch it until 30 seconds
-+ * from now, and thus we will lock up here.
-+ *
-+ * Promote the inode buffer to the front of the delwri list
-+ * and wake up xfsbufd now.
-+ */
-+ xfs_promote_inode(ip);
- xfs_iflock(ip);
+ static void n_tty_packet_mode_flush(struct tty_struct *tty)
+@@ -1745,7 +1747,16 @@ static void n_tty_set_termios(struct tty_struct *tty, struct ktermios *old)
+
+ if (!old || (old->c_lflag ^ tty->termios.c_lflag) & ICANON) {
+ bitmap_zero(ldata->read_flags, N_TTY_BUF_SIZE);
+- ldata->line_start = ldata->canon_head = ldata->read_tail;
++ ldata->line_start = ldata->read_tail;
++ if (!L_ICANON(tty) || !read_cnt(ldata)) {
++ ldata->canon_head = ldata->read_tail;
++ ldata->push = 0;
++ } else {
++ set_bit((ldata->read_head - 1) & (N_TTY_BUF_SIZE - 1),
++ ldata->read_flags);
++ ldata->canon_head = ldata->read_head;
++ ldata->push = 1;
++ }
+ ldata->erasing = 0;
+ ldata->lnext = 0;
}
-
+@@ -1951,6 +1962,12 @@ static int copy_from_read_buf(struct tty_struct *tty,
+ * it copies one line of input up to and including the line-delimiting
+ * character into the user-space buffer.
+ *
++ * NB: When termios is changed from non-canonical to canonical mode and
++ * the read buffer contains data, n_tty_set_termios() simulates an EOF
++ * push (as if C-d were input) _without_ the DISABLED_CHAR in the buffer.
++ * This causes data already processed as input to be immediately available
++ * as input although a newline has not been received.
++ *
+ * Called under the atomic_read_lock mutex
+ *
+ * n_tty_read()/consumer path:
+@@ -1997,7 +2014,7 @@ static int canon_copy_from_read_buf(struct tty_struct *tty,
+ n += found;
+ c = n;
+
+- if (found && read_buf(ldata, eol) == __DISABLED_CHAR) {
++ if (found && !ldata->push && read_buf(ldata, eol) == __DISABLED_CHAR) {
+ n--;
+ eof_push = !n && ldata->read_tail != ldata->line_start;
+ }
+@@ -2024,7 +2041,10 @@ static int canon_copy_from_read_buf(struct tty_struct *tty,
+ ldata->read_tail += c;
+
+ if (found) {
+- ldata->line_start = ldata->read_tail;
++ if (!ldata->push)
++ ldata->line_start = ldata->read_tail;
++ else
++ ldata->push = 0;
+ tty_audit_push(tty);
+ }
+ return eof_push ? -EAGAIN : 0;
projects / packages / kernel.git / blobdiff