X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=kernel-small_fixes.patch;h=3ac8a0bb6f5863a1b0df259a7772e02a99fae9d7;hb=4fed1ed8baad6c56e4111d29415de44215529fc1;hp=92cfb5ef0bfdfff8c5c8b1c55626715dcc0407ca;hpb=dd5340b296f3965f78488f938a723525ee7e012f;p=packages%2Fkernel.git diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch index 92cfb5ef..3ac8a0bb 100644 --- a/kernel-small_fixes.patch +++ b/kernel-small_fixes.patch @@ -26,375 +26,97 @@ exit fi done +--- a/Makefile 2016-11-10 20:41:43.646224629 +0100 ++++ b/Makefile 2016-11-10 20:40:35.640323501 +0100 +@@ -784,6 +774,9 @@ + # Prohibit date/time macros, which would make the build non-deterministic + KBUILD_CFLAGS += $(call cc-option,-Werror=date-time) + ++# enforce correct pointer usage ++KBUILD_CFLAGS += $(call cc-option,-Werror=incompatible-pointer-types) ++ + # use the deterministic mode of AR if available + KBUILD_ARFLAGS := $(call ar-option,D) + +From 5d12f71723762a39435d054d02bbf5fb87c5cd14 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= +Date: Mon, 6 Feb 2017 14:45:15 +0100 +Subject: [PATCH] mac80211: Print text for disassociation reason +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit -From: Dave Chinner - -When we do inode readahead in log recovery, we do can do the -readahead before we've replayed the icreate transaction that stamps -the buffer with inode cores. The inode readahead verifier catches -this and marks the buffer as !done to indicate that it doesn't yet -contain valid inodes. - -In adding buffer error notification (i.e. setting b_error = -EIO at -the same time as as we clear the done flag) to such a readahead -verifier failure, we can then get subsequent inode recovery failing -with this error: - -XFS (dm-0): metadata I/O error: block 0xa00060 ("xlog_recover_do..(read#2)") error 5 numblks 32 - -This occurs when readahead completion races with icreate item replay -such as: - - inode readahead - find buffer - lock buffer - submit RA io - .... - icreate recovery - xfs_trans_get_buffer - find buffer - lock buffer - - ..... - - fails verifier - clear XBF_DONE - set bp->b_error = -EIO - release and unlock buffer - - icreate initialises buffer - marks buffer as done - adds buffer to delayed write queue - releases buffer - -At this point, we have an initialised inode buffer that is up to -date but has an -EIO state registered against it. When we finally -get to recovering an inode in that buffer: - - inode item recovery - xfs_trans_read_buffer - find buffer - lock buffer - sees XBF_DONE is set, returns buffer - sees bp->b_error is set - fail log recovery! - -Essentially, we need xfs_trans_get_buf_map() to clear the error status of -the buffer when doing a lookup. This function returns uninitialised -buffers, so the buffer returned can not be in an error state and -none of the code that uses this function expects b_error to be set -on return. Indeed, there is an ASSERT(!bp->b_error); in the -transaction case in xfs_trans_get_buf_map() that would have caught -this if log recovery used transactions.... - -This patch firstly changes the inode readahead failure to set -EIO -on the buffer, and secondly changes xfs_buf_get_map() to never -return a buffer with an error state set so this first change doesn't -cause unexpected log recovery failures. +When disassociation happens only numeric reason is printed +in ieee80211_rx_mgmt_disassoc(). Add text variant, too. -Signed-off-by: Dave Chinner +Signed-off-by: Arkadiusz Miśkiewicz --- - fs/xfs/libxfs/xfs_inode_buf.c | 12 +++++++----- - fs/xfs/xfs_buf.c | 7 +++++++ - 2 files changed, 14 insertions(+), 5 deletions(-) + net/mac80211/mlme.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) -diff --git a/fs/xfs/libxfs/xfs_inode_buf.c b/fs/xfs/libxfs/xfs_inode_buf.c -index 1b8d98a..ff17c48 100644 ---- a/fs/xfs/libxfs/xfs_inode_buf.c -+++ b/fs/xfs/libxfs/xfs_inode_buf.c -@@ -62,11 +62,12 @@ xfs_inobp_check( - * has not had the inode cores stamped into it. Hence for readahead, the buffer - * may be potentially invalid. - * -- * If the readahead buffer is invalid, we don't want to mark it with an error, -- * but we do want to clear the DONE status of the buffer so that a followup read -- * will re-read it from disk. This will ensure that we don't get an unnecessary -- * warnings during log recovery and we don't get unnecssary panics on debug -- * kernels. -+ * If the readahead buffer is invalid, we need to mark it with an error and -+ * clear the DONE status of the buffer so that a followup read will re-read it -+ * from disk. We don't report the error otherwise to avoid warnings during log -+ * recovery and we don't get unnecssary panics on debug kernels. We use EIO here -+ * because all we want to do is say readahead failed; there is no-one to report -+ * the error to, so this will distinguish it from a non-ra verifier failure. - */ - static void - xfs_inode_buf_verify( -@@ -93,6 +94,7 @@ xfs_inode_buf_verify( - XFS_RANDOM_ITOBP_INOTOBP))) { - if (readahead) { - bp->b_flags &= ~XBF_DONE; -+ xfs_buf_ioerror(bp, -EIO); - return; - } +diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c +index 098ce9b179ee..fcf8d0aa66ec 100644 +--- a/net/mac80211/mlme.c ++++ b/net/mac80211/mlme.c +@@ -2801,8 +2801,9 @@ static void ieee80211_rx_mgmt_disassoc(struct ieee80211_sub_if_data *sdata, -diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c -index 45a8ea7..ae86b16 100644 ---- a/fs/xfs/xfs_buf.c -+++ b/fs/xfs/xfs_buf.c -@@ -604,6 +604,13 @@ found: - } - } + reason_code = le16_to_cpu(mgmt->u.disassoc.reason_code); + +- sdata_info(sdata, "disassociated from %pM (Reason: %u)\n", +- mgmt->sa, reason_code); ++ sdata_info(sdata, "disassociated from %pM (Reason: %u=%s)\n", ++ mgmt->sa, reason_code, ++ ieee80211_get_reason_code_string(reason_code)); + + ieee80211_set_disassoc(sdata, 0, 0, false, NULL); -+ /* -+ * Clear b_error if this is a lookup from a caller that doesn't expect -+ * valid data to be found in the buffer. -+ */ -+ if (!(flags & XBF_READ)) -+ xfs_buf_ioerror(bp, 0); -+ - XFS_STATS_INC(target->bt_mount, xb_get); - trace_xfs_buf_get(bp, flags, _RET_IP_); - return bp; -- -2.5.0 +2.11.0 -_______________________________________________ -xfs mailing list -xfs@oss.sgi.com -http://oss.sgi.com/mailman/listinfo/xfs -From: Dave Chinner +From 5edabca9d4cff7f1f2b68f0bac55ef99d9798ba4 Mon Sep 17 00:00:00 2001 +From: Andrey Konovalov +Date: Thu, 16 Feb 2017 17:22:46 +0100 +Subject: dccp: fix freeing skb too early for IPV6_RECVPKTINFO -When we do dquot readahead in log recovery, we do not use a verifier -as the underlying buffer may not have dquots in it. e.g. the -allocation operation hasn't yet been replayed. Hence we do not want -to fail recovery because we detect an operation to be replayed has -not been run yet. This problem was addressed for inodes in commit -d891400 ("xfs: inode buffers may not be valid during recovery -readahead") but the problem was not recognised to exist for dquots -and their buffers as the dquot readahead did not have a verifier. +In the current DCCP implementation an skb for a DCCP_PKT_REQUEST packet +is forcibly freed via __kfree_skb in dccp_rcv_state_process if +dccp_v6_conn_request successfully returns. -The result of not using a verifier is that when the buffer is then -next read to replay a dquot modification, the dquot buffer verifier -will only be attached to the buffer if *readahead is not complete*. -Hence we can read the buffer, replay the dquot changes and then add -it to the delwri submission list without it having a verifier -attached to it. This then generates warnings in xfs_buf_ioapply(), -which catches and warns about this case. +However, if IPV6_RECVPKTINFO is set on a socket, the address of the skb +is saved to ireq->pktopts and the ref count for skb is incremented in +dccp_v6_conn_request, so skb is still in use. Nevertheless, it gets freed +in dccp_rcv_state_process. -Fix this and make it handle the same readahead verifier error cases -as for inode buffers by adding a new readahead verifier that has a -write operation as well as a read operation that marks the buffer as -not done if any corruption is detected. Also make sure we don't run -readahead if the dquot buffer has been marked as cancelled by -recovery. +Fix by calling consume_skb instead of doing goto discard and therefore +calling __kfree_skb. -This will result in readahead either succeeding and the buffer -having a valid write verifier, or readahead failing and the buffer -state requiring the subsequent read to resubmit the IO with the new -verifier. In either case, this will result in the buffer always -ending up with a valid write verifier on it. +Similar fixes for TCP: -Note: we also need to fix the inode buffer readahead error handling -to mark the buffer with EIO. Brian noticed the code I copied from -there wrong during review, so fix it at the same time. Add comments -linking the two functions that handle readahead verifier errors -together so we don't forget this behavioural link in future. +fb7e2399ec17f1004c0e0ccfd17439f8759ede01 [TCP]: skb is unexpectedly freed. +0aea76d35c9651d55bbaf746e7914e5f9ae5a25d tcp: SYN packets are now +simply consumed -cc: # 3.12 - current -Signed-off-by: Dave Chinner -Reviewed-by: Brian Foster -Signed-off-by: Dave Chinner +Signed-off-by: Andrey Konovalov +Acked-by: Eric Dumazet +Signed-off-by: David S. Miller --- - fs/xfs/libxfs/xfs_dquot_buf.c | 36 ++++++++++++++++++++++++++++++------ - fs/xfs/libxfs/xfs_inode_buf.c | 2 ++ - fs/xfs/libxfs/xfs_quota_defs.h | 2 +- - fs/xfs/libxfs/xfs_shared.h | 1 + - fs/xfs/xfs_log_recover.c | 9 +++++++-- - 5 files changed, 41 insertions(+), 9 deletions(-) - -diff --git a/fs/xfs/libxfs/xfs_dquot_buf.c b/fs/xfs/libxfs/xfs_dquot_buf.c -index 11cefb2..3cc3cf7 100644 ---- a/fs/xfs/libxfs/xfs_dquot_buf.c -+++ b/fs/xfs/libxfs/xfs_dquot_buf.c -@@ -54,7 +54,7 @@ xfs_dqcheck( - xfs_dqid_t id, - uint type, /* used only when IO_dorepair is true */ - uint flags, -- char *str) -+ const char *str) - { - xfs_dqblk_t *d = (xfs_dqblk_t *)ddq; - int errs = 0; -@@ -207,7 +207,8 @@ xfs_dquot_buf_verify_crc( - STATIC bool - xfs_dquot_buf_verify( - struct xfs_mount *mp, -- struct xfs_buf *bp) -+ struct xfs_buf *bp, -+ int warn) - { - struct xfs_dqblk *d = (struct xfs_dqblk *)bp->b_addr; - xfs_dqid_t id = 0; -@@ -240,8 +241,7 @@ xfs_dquot_buf_verify( - if (i == 0) - id = be32_to_cpu(ddq->d_id); - -- error = xfs_dqcheck(mp, ddq, id + i, 0, XFS_QMOPT_DOWARN, -- "xfs_dquot_buf_verify"); -+ error = xfs_dqcheck(mp, ddq, id + i, 0, warn, __func__); - if (error) - return false; - } -@@ -256,7 +256,7 @@ xfs_dquot_buf_read_verify( - - if (!xfs_dquot_buf_verify_crc(mp, bp)) - xfs_buf_ioerror(bp, -EFSBADCRC); -- else if (!xfs_dquot_buf_verify(mp, bp)) -+ else if (!xfs_dquot_buf_verify(mp, bp, XFS_QMOPT_DOWARN)) - xfs_buf_ioerror(bp, -EFSCORRUPTED); - - if (bp->b_error) -@@ -264,6 +264,25 @@ xfs_dquot_buf_read_verify( - } - - /* -+ * readahead errors are silent and simply leave the buffer as !done so a real -+ * read will then be run with the xfs_dquot_buf_ops verifier. See -+ * xfs_inode_buf_verify() for why we use EIO and ~XBF_DONE here rather than -+ * reporting the failure. -+ */ -+static void -+xfs_dquot_buf_readahead_verify( -+ struct xfs_buf *bp) -+{ -+ struct xfs_mount *mp = bp->b_target->bt_mount; -+ -+ if (!xfs_dquot_buf_verify_crc(mp, bp) || -+ !xfs_dquot_buf_verify(mp, bp, 0)) { -+ xfs_buf_ioerror(bp, -EIO); -+ bp->b_flags &= ~XBF_DONE; -+ } -+} -+ -+/* - * we don't calculate the CRC here as that is done when the dquot is flushed to - * the buffer after the update is done. This ensures that the dquot in the - * buffer always has an up-to-date CRC value. -@@ -274,7 +293,7 @@ xfs_dquot_buf_write_verify( - { - struct xfs_mount *mp = bp->b_target->bt_mount; - -- if (!xfs_dquot_buf_verify(mp, bp)) { -+ if (!xfs_dquot_buf_verify(mp, bp, XFS_QMOPT_DOWARN)) { - xfs_buf_ioerror(bp, -EFSCORRUPTED); - xfs_verifier_error(bp); - return; -@@ -287,3 +306,8 @@ const struct xfs_buf_ops xfs_dquot_buf_ops = { - .verify_write = xfs_dquot_buf_write_verify, - }; - -+const struct xfs_buf_ops xfs_dquot_buf_ra_ops = { -+ -+ .verify_read = xfs_dquot_buf_readahead_verify, -+ .verify_write = xfs_dquot_buf_write_verify, -+}; -diff --git a/fs/xfs/libxfs/xfs_inode_buf.c b/fs/xfs/libxfs/xfs_inode_buf.c -index ff17c48..1aabfda 100644 ---- a/fs/xfs/libxfs/xfs_inode_buf.c -+++ b/fs/xfs/libxfs/xfs_inode_buf.c -@@ -68,6 +68,8 @@ xfs_inobp_check( - * recovery and we don't get unnecssary panics on debug kernels. We use EIO here - * because all we want to do is say readahead failed; there is no-one to report - * the error to, so this will distinguish it from a non-ra verifier failure. -+ * Changes to this readahead error behavour also need to be reflected in -+ * xfs_dquot_buf_readahead_verify(). - */ - static void - xfs_inode_buf_verify( -diff --git a/fs/xfs/libxfs/xfs_quota_defs.h b/fs/xfs/libxfs/xfs_quota_defs.h -index 1b0a083..f51078f 100644 ---- a/fs/xfs/libxfs/xfs_quota_defs.h -+++ b/fs/xfs/libxfs/xfs_quota_defs.h -@@ -153,7 +153,7 @@ typedef __uint16_t xfs_qwarncnt_t; - #define XFS_QMOPT_RESBLK_MASK (XFS_QMOPT_RES_REGBLKS | XFS_QMOPT_RES_RTBLKS) - - extern int xfs_dqcheck(struct xfs_mount *mp, xfs_disk_dquot_t *ddq, -- xfs_dqid_t id, uint type, uint flags, char *str); -+ xfs_dqid_t id, uint type, uint flags, const char *str); - extern int xfs_calc_dquots_per_chunk(unsigned int nbblks); - - #endif /* __XFS_QUOTA_H__ */ -diff --git a/fs/xfs/libxfs/xfs_shared.h b/fs/xfs/libxfs/xfs_shared.h -index 5be5297..15c3ceb 100644 ---- a/fs/xfs/libxfs/xfs_shared.h -+++ b/fs/xfs/libxfs/xfs_shared.h -@@ -49,6 +49,7 @@ extern const struct xfs_buf_ops xfs_inobt_buf_ops; - extern const struct xfs_buf_ops xfs_inode_buf_ops; - extern const struct xfs_buf_ops xfs_inode_buf_ra_ops; - extern const struct xfs_buf_ops xfs_dquot_buf_ops; -+extern const struct xfs_buf_ops xfs_dquot_buf_ra_ops; - extern const struct xfs_buf_ops xfs_sb_buf_ops; - extern const struct xfs_buf_ops xfs_sb_quiet_buf_ops; - extern const struct xfs_buf_ops xfs_symlink_buf_ops; -diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c -index c5ecaac..5991cdc 100644 ---- a/fs/xfs/xfs_log_recover.c -+++ b/fs/xfs/xfs_log_recover.c -@@ -3204,6 +3204,7 @@ xlog_recover_dquot_ra_pass2( - struct xfs_disk_dquot *recddq; - struct xfs_dq_logformat *dq_f; - uint type; -+ int len; - - - if (mp->m_qflags == 0) -@@ -3224,8 +3225,12 @@ xlog_recover_dquot_ra_pass2( - ASSERT(dq_f); - ASSERT(dq_f->qlf_len == 1); - -- xfs_buf_readahead(mp->m_ddev_targp, dq_f->qlf_blkno, -- XFS_FSB_TO_BB(mp, dq_f->qlf_len), NULL); -+ len = XFS_FSB_TO_BB(mp, dq_f->qlf_len); -+ if (xlog_peek_buffer_cancelled(log, dq_f->qlf_blkno, len, 0)) -+ return; -+ -+ xfs_buf_readahead(mp->m_ddev_targp, dq_f->qlf_blkno, len, -+ &xfs_dquot_buf_ra_ops); - } - - STATIC void + net/dccp/input.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/net/dccp/input.c b/net/dccp/input.c +index ba34718..8fedc2d 100644 +--- a/net/dccp/input.c ++++ b/net/dccp/input.c +@@ -606,7 +606,8 @@ int dccp_rcv_state_process(struct sock *sk, struct sk_buff *skb, + if (inet_csk(sk)->icsk_af_ops->conn_request(sk, + skb) < 0) + return 1; +- goto discard; ++ consume_skb(skb); ++ return 0; + } + if (dh->dccph_type == DCCP_PKT_RESET) + goto discard; -- -2.5.0 - -_______________________________________________ -xfs mailing list -xfs@oss.sgi.com -http://oss.sgi.com/mailman/listinfo/xfs -From david at fromorbit.com Tue Jan 12 23:12:48 2016 -From: david at fromorbit.com (Dave Chinner) -Date: Wed, 13 Jan 2016 16:12:48 +1100 -Subject: [PATCH] Revert "xfs: clear PF_NOFREEZE for xfsaild kthread" -Message-ID: <1452661968-11482-1-git-send-email-david@fromorbit.com> -Content-Length: 916 -Lines: 30 - -This reverts commit 24ba16bb3d499c49974669cd8429c3e4138ab102 as it -prevents machines from suspending. This regression occurs when the -xfsaild is idle on entry to suspend, and so there s no activity to -wake it from it's idle sleep and hence see that it is supposed to -freeze. Hence the freezer times out waiting for it and suspend is -cancelled. - -There is no obvious fix for this short of freezing the filesystem -properly, so revert this change for now. +cgit v0.12 -Signed-off-by: Dave Chinner ---- - fs/xfs/xfs_trans_ail.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/fs/xfs/xfs_trans_ail.c b/fs/xfs/xfs_trans_ail.c -index aa67339..4f18fd9 100644 ---- a/fs/xfs/xfs_trans_ail.c -+++ b/fs/xfs/xfs_trans_ail.c -@@ -497,7 +497,6 @@ xfsaild( - long tout = 0; /* milliseconds */ - - current->flags |= PF_MEMALLOC; -- set_freezable(); - - while (!kthread_should_stop()) { - if (tout && tout <= 20) --- -2.5.0