Home Home > GIT Browse > openSUSE-15.1
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2019-08-23 07:45:14 +0200
committerKernel Build Daemon <kbuild@suse.de>2019-08-23 07:45:14 +0200
commit2a3c72e316ac78d15be3ef278b79b5de7b2d1071 (patch)
tree75e7fc0e8ef6c7d1021ebad0379aa3028bb9db04
parent48924feb30aedc6cef1038c502b5bfcb3bfcfa0c (diff)
parent0181a93c80e7cb5c96f62b320766635ceeab3f8d (diff)
Merge branch 'SLE15-SP1' into openSUSE-15.1openSUSE-15.1
-rw-r--r--kabi/severities27
-rw-r--r--patches.drivers/scsi-qla2xxx-Change-a-stack-variable-into-a-static-c.patch35
-rw-r--r--patches.fixes/tracing-Fix-bad-use-of-igrab-in-trace_uprobe.c.patch68
-rw-r--r--series.conf1
4 files changed, 67 insertions, 64 deletions
diff --git a/kabi/severities b/kabi/severities
index 6e29876daf..a26a0840e7 100644
--- a/kabi/severities
+++ b/kabi/severities
@@ -40,18 +40,6 @@ sclp PASS
# nobody cares bcache symbols
drivers/md/bcache/* PASS
-# ceph-related modules
-net/ceph/libceph PASS
-drivers/block/rbd PASS
-fs/ceph PASS
-
-# no out-of-tree users
-drivers/crypto/ccp/* PASS
-
-# intermodule syms shared between cxgb4 and cxgb4vf
-drivers/net/ethernet/chelsio/cxgb4/* PASS
-drivers/net/ethernet/chelsio/cxgb4vf/* PASS
-
# inter-module symbols for qed/qede/qedf/qedi/qedr
drivers/net/ethernet/qlogic/qed/* PASS
drivers/net/ethernet/qlogic/qede/* PASS
@@ -59,8 +47,23 @@ drivers/scsi/qedf/* PASS
drivers/scsi/qedi/* PASS
drivers/infiniband/hw/qedr/* PASS
+# qla2xxx only has local symbols
+drivers/scsi/qla2xxx/* PASS
+
# inter-module symbols for hns3
drivers/net/ethernet/hisilicon/hns3/* PASS
drivers/net/ethernet/hisilicon/hns3/hns3pf/* PASS
drivers/net/ethernet/hisilicon/hns3/hns3vf/* PASS
drivers/infiniband/hw/hns/* PASS
+
+# ceph-related modules
+net/ceph/libceph PASS
+drivers/block/rbd PASS
+fs/ceph PASS
+
+# no out-of-tree users
+drivers/crypto/ccp/* PASS
+
+# intermodule syms shared between cxgb4 and cxgb4vf
+drivers/net/ethernet/chelsio/cxgb4/* PASS
+drivers/net/ethernet/chelsio/cxgb4vf/* PASS
diff --git a/patches.drivers/scsi-qla2xxx-Change-a-stack-variable-into-a-static-c.patch b/patches.drivers/scsi-qla2xxx-Change-a-stack-variable-into-a-static-c.patch
deleted file mode 100644
index b450b7d5d8..0000000000
--- a/patches.drivers/scsi-qla2xxx-Change-a-stack-variable-into-a-static-c.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Bart Van Assche <bvanassche@acm.org>
-Date: Thu, 4 Apr 2019 12:44:39 -0700
-Subject: scsi: qla2xxx: Change a stack variable into a static const variable
-Patch-mainline: v5.2-rc1
-Git-commit: c02ee1e5a946575feea01367f647c56e24525f22
-References: bsc#1082635 bsc#1141340 bsc#1143706
-
-Make qla2x00_get_host_fabric_name() slightly faster by changing a stack
-array into a static array. Declare that array const now that the
-wwn_to_u64() argument pointer has been declared const.
-
-Cc: Himanshu Madhani <hmadhani@marvell.com>
-Cc: Giridhar Malavali <gmalavali@marvell.com>
-Signed-off-by: Bart Van Assche <bvanassche@acm.org>
-Acked-by: Himanshu Madhani <hmadhani@marvell.com>
-Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
-Acked-by: Daniel Wagner <dwagner@suse.de>
----
- drivers/scsi/qla2xxx/qla_attr.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
---- a/drivers/scsi/qla2xxx/qla_attr.c
-+++ b/drivers/scsi/qla2xxx/qla_attr.c
-@@ -2723,8 +2723,9 @@ static void
- qla2x00_get_host_fabric_name(struct Scsi_Host *shost)
- {
- scsi_qla_host_t *vha = shost_priv(shost);
-- uint8_t node_name[WWN_SIZE] = { 0xFF, 0xFF, 0xFF, 0xFF, \
-- 0xFF, 0xFF, 0xFF, 0xFF};
-+ static const uint8_t node_name[WWN_SIZE] = {
-+ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
-+ };
- u64 fabric_name = wwn_to_u64(node_name);
-
- if (vha->device_flags & SWITCH_FOUND)
diff --git a/patches.fixes/tracing-Fix-bad-use-of-igrab-in-trace_uprobe.c.patch b/patches.fixes/tracing-Fix-bad-use-of-igrab-in-trace_uprobe.c.patch
index 24a4a425db..41e69a33cc 100644
--- a/patches.fixes/tracing-Fix-bad-use-of-igrab-in-trace_uprobe.c.patch
+++ b/patches.fixes/tracing-Fix-bad-use-of-igrab-in-trace_uprobe.c.patch
@@ -4,7 +4,7 @@ Date: Mon, 23 Apr 2018 10:21:34 -0700
Subject: [PATCH] tracing: Fix bad use of igrab in trace_uprobe.c
Git-commit: 0c92c7a3c5d416f47b32c5f20a611dfeca5d5f2e
Patch-mainline: v4.17-rc4
-References: bsc#1120046
+References: bsc#1120046, bsc#1146141
As Miklos reported and suggested:
@@ -34,10 +34,6 @@ referenced.
Link: http://lkml.kernel.org/r/20180423172135.4050588-1-songliubraving@fb.com
-[pmladek: Removed last 3 hunks for create_local_trace_uprobe(). This feature
- missing and does not need fixing.
-]
-
Fixes: f3f096cfedf8 ("tracing: Provide trace events interface for uprobes")
Fixes: 33ea4b24277b ("perf/core: Implement the 'perf_uprobe' PMU")
Cc: stable@vger.kernel.org
@@ -50,11 +46,12 @@ Reported-by: Miklos Szeredi <miklos@szeredi.hu>
Signed-off-by: Song Liu <songliubraving@fb.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Acked-by: Petr Mladek <pmladek@suse.com>
-
---
- kernel/trace/trace_uprobe.c | 24 ++++++++++--------------
- 1 file changed, 10 insertions(+), 14 deletions(-)
+ kernel/trace/trace_uprobe.c | 35 ++++++++++++++---------------------
+ 1 file changed, 14 insertions(+), 21 deletions(-)
+diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
+index 34fd0e0ec51d..ac892878dbe6 100644
--- a/kernel/trace/trace_uprobe.c
+++ b/kernel/trace/trace_uprobe.c
@@ -55,6 +55,7 @@ struct trace_uprobe {
@@ -65,7 +62,7 @@ Acked-by: Petr Mladek <pmladek@suse.com>
struct inode *inode;
char *filename;
unsigned long offset;
-@@ -289,7 +290,7 @@ static void free_trace_uprobe(struct tra
+@@ -289,7 +290,7 @@ static void free_trace_uprobe(struct trace_uprobe *tu)
for (i = 0; i < tu->tp.nr_args; i++)
traceprobe_free_probe_arg(&tu->tp.args[i]);
@@ -74,7 +71,7 @@ Acked-by: Petr Mladek <pmladek@suse.com>
kfree(tu->tp.call.class->system);
kfree(tu->tp.call.name);
kfree(tu->filename);
-@@ -363,7 +364,6 @@ end:
+@@ -363,7 +364,6 @@ static int register_trace_uprobe(struct trace_uprobe *tu)
static int create_trace_uprobe(int argc, char **argv)
{
struct trace_uprobe *tu;
@@ -82,7 +79,7 @@ Acked-by: Petr Mladek <pmladek@suse.com>
char *arg, *event, *group, *filename;
char buf[MAX_EVENT_NAME_LEN];
struct path path;
-@@ -371,7 +371,6 @@ static int create_trace_uprobe(int argc,
+@@ -371,7 +371,6 @@ static int create_trace_uprobe(int argc, char **argv)
bool is_delete, is_return;
int i, ret;
@@ -90,7 +87,7 @@ Acked-by: Petr Mladek <pmladek@suse.com>
ret = 0;
is_delete = false;
is_return = false;
-@@ -437,21 +436,16 @@ static int create_trace_uprobe(int argc,
+@@ -437,21 +436,16 @@ static int create_trace_uprobe(int argc, char **argv)
}
/* Find the last occurrence, in case the path contains ':' too. */
arg = strrchr(argv[1], ':');
@@ -116,7 +113,7 @@ Acked-by: Petr Mladek <pmladek@suse.com>
ret = -EINVAL;
goto fail_address_parse;
}
-@@ -490,7 +484,7 @@ static int create_trace_uprobe(int argc,
+@@ -490,7 +484,7 @@ static int create_trace_uprobe(int argc, char **argv)
goto fail_address_parse;
}
tu->offset = offset;
@@ -125,7 +122,7 @@ Acked-by: Petr Mladek <pmladek@suse.com>
tu->filename = kstrdup(filename, GFP_KERNEL);
if (!tu->filename) {
-@@ -558,7 +552,7 @@ error:
+@@ -558,7 +552,7 @@ static int create_trace_uprobe(int argc, char **argv)
return ret;
fail_address_parse:
@@ -134,7 +131,7 @@ Acked-by: Petr Mladek <pmladek@suse.com>
pr_info("Failed to parse address or file.\n");
-@@ -937,6 +931,7 @@ probe_event_enable(struct trace_uprobe *
+@@ -922,6 +916,7 @@ probe_event_enable(struct trace_uprobe *tu, struct trace_event_file *file,
goto err_flags;
tu->consumer.filter = filter;
@@ -142,7 +139,7 @@ Acked-by: Petr Mladek <pmladek@suse.com>
ret = uprobe_register(tu->inode, tu->offset, &tu->consumer);
if (ret)
goto err_buffer;
-@@ -982,6 +977,7 @@ probe_event_disable(struct trace_uprobe
+@@ -967,6 +962,7 @@ probe_event_disable(struct trace_uprobe *tu, struct trace_event_file *file)
WARN_ON(!uprobe_filter_is_empty(&tu->filter));
uprobe_unregister(tu->inode, tu->offset, &tu->consumer);
@@ -150,3 +147,42 @@ Acked-by: Petr Mladek <pmladek@suse.com>
tu->tp.flags &= file ? ~TP_FLAG_TRACE : ~TP_FLAG_PROFILE;
uprobe_buffer_disable();
+@@ -1337,7 +1333,6 @@ struct trace_event_call *
+ create_local_trace_uprobe(char *name, unsigned long offs, bool is_return)
+ {
+ struct trace_uprobe *tu;
+- struct inode *inode;
+ struct path path;
+ int ret;
+
+@@ -1345,11 +1340,8 @@ create_local_trace_uprobe(char *name, unsigned long offs, bool is_return)
+ if (ret)
+ return ERR_PTR(ret);
+
+- inode = igrab(d_inode(path.dentry));
+- path_put(&path);
+-
+- if (!inode || !S_ISREG(inode->i_mode)) {
+- iput(inode);
++ if (!d_is_reg(path.dentry)) {
++ path_put(&path);
+ return ERR_PTR(-EINVAL);
+ }
+
+@@ -1364,11 +1356,12 @@ create_local_trace_uprobe(char *name, unsigned long offs, bool is_return)
+ if (IS_ERR(tu)) {
+ pr_info("Failed to allocate trace_uprobe.(%d)\n",
+ (int)PTR_ERR(tu));
++ path_put(&path);
+ return ERR_CAST(tu);
+ }
+
+ tu->offset = offs;
+- tu->inode = inode;
++ tu->path = path;
+ tu->filename = kstrdup(name, GFP_KERNEL);
+ init_trace_event_call(tu, &tu->tp.call);
+
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index 0b66325677..200fe53183 100644
--- a/series.conf
+++ b/series.conf
@@ -47335,7 +47335,6 @@
patches.drivers/scsi-scsi_transport_fc-Add-FPIN-fc-event-codes.patch
patches.drivers/scsi-lpfc-add-support-for-posting-FC-events-on-FPIN-.patch
patches.drivers/scsi-qla2xxx-fix-spelling-mistake-alredy-already.patch
- patches.drivers/scsi-qla2xxx-Change-a-stack-variable-into-a-static-c.patch
patches.drivers/scsi-qla2xxx-Remove-a-comment-that-refers-to-the-SCS.patch
patches.drivers/scsi-qla2xxx-Use-ARRAY_SIZE-in-the-definition-of-QLA.patch
patches.drivers/scsi-qla2xxx-Declare-local-symbols-static.patch