linux-nvme.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] nvme: Fix uninitialized-variable warning
@ 2020-02-19 16:19 Keith Busch
  2020-02-19 16:22 ` Christoph Hellwig
  2020-02-20  7:43 ` Sagi Grimberg
  0 siblings, 2 replies; 9+ messages in thread
From: Keith Busch @ 2020-02-19 16:19 UTC (permalink / raw)
  To: linux-nvme, sagi, hch; +Cc: Keith Busch, Arnd Bergmann

gcc may detect a false positive on nvme using an unintialized variable
if setting features fails. Since this is not a fast path, explicitly
initialize this variable to suppress the warning.

Reported-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Keith Busch <kbusch@kernel.org>
---
 drivers/nvme/host/core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index ada59df642d2..a4d8c90ee7cc 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -1165,8 +1165,8 @@ static int nvme_identify_ns(struct nvme_ctrl *ctrl,
 static int nvme_features(struct nvme_ctrl *dev, u8 op, unsigned int fid,
 		unsigned int dword11, void *buffer, size_t buflen, u32 *result)
 {
+	union nvme_result res = { 0 };
 	struct nvme_command c;
-	union nvme_result res;
 	int ret;
 
 	memset(&c, 0, sizeof(c));
-- 
2.21.0


_______________________________________________
linux-nvme mailing list
linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme

^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [PATCH] nvme: fix uninitialized-variable warning
@ 2020-01-07 21:42 Arnd Bergmann
  2020-01-30 15:04 ` Christoph Hellwig
  0 siblings, 1 reply; 9+ messages in thread
From: Arnd Bergmann @ 2020-01-07 21:42 UTC (permalink / raw)
  To: Keith Busch, Jens Axboe, Christoph Hellwig, Sagi Grimberg
  Cc: Oleksandr Natalenko, Bart Van Assche, Chaitanya Kulkarni,
	Marta Rybczynska, linux-kernel, linux-nvme, Arnd Bergmann,
	Hannes Reinecke

gcc -O3 adds a bogus warning in this file:

In file included from include/linux/compiler_types.h:68,
                 from <command-line>:
drivers/nvme/host/core.c: In function 'nvme_set_queue_count':
include/linux/compiler-gcc.h:71:45: error: 'res.u32' may be used uninitialized in this function [-Werror=maybe-uninitialized]
 #define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)
                                             ^~~~~~~~~~~~
drivers/nvme/host/core.c:1167:20: note: 'res.u32' was declared here
  union nvme_result res;
                    ^~~

Slightly rearrange the code, enough to let gcc understand
better what is going on and not warn about it.

Fixes: mmtom ("init/Kconfig: enable -O3 for all arches")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/nvme/host/core.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 667f18f465be..6f0991e8c5cc 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -825,14 +825,15 @@ int __nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd,
 	int ret;
 
 	req = nvme_alloc_request(q, cmd, flags, qid);
-	if (IS_ERR(req))
-		return PTR_ERR(req);
+	ret = PTR_ERR_OR_ZERO(req);
+	if (ret < 0)
+		return ret;
 
 	req->timeout = timeout ? timeout : ADMIN_TIMEOUT;
 
 	if (buffer && bufflen) {
 		ret = blk_rq_map_kern(q, req, buffer, bufflen, GFP_KERNEL);
-		if (ret)
+		if (ret < 0)
 			goto out;
 	}
 
-- 
2.20.0


_______________________________________________
linux-nvme mailing list
linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme

^ permalink raw reply related	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2020-02-20  7:43 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-19 16:19 [PATCH] nvme: Fix uninitialized-variable warning Keith Busch
2020-02-19 16:22 ` Christoph Hellwig
2020-02-20  7:43 ` Sagi Grimberg
  -- strict thread matches above, loose matches on Subject: below --
2020-01-07 21:42 [PATCH] nvme: fix " Arnd Bergmann
2020-01-30 15:04 ` Christoph Hellwig
2020-01-30 15:36   ` Arnd Bergmann
2020-01-30 15:48     ` Christoph Hellwig
2020-02-13 19:51       ` Keith Busch
2020-02-19 15:21         ` Christoph Hellwig

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).