c5432960d9
Update to the head of the upstream staging branch
* Previous patches 0001-0042 are included in the source tarball
* Patches 0001-0032 are from the upstream staging branch
Rename redhat patches
* Previous patches 0043-0053 are now patches 0033-0043
Change back to using readline instead of libedit
* The code the uses readline has been isolated from the code that
is licensed gpl v2 only.
Add libmpathutil libraries to spec file
Add multipathc program to spec file
Add multipath.conf systemd tempfile configuration to spec file
Misc spec file cleanups
85 lines
2.4 KiB
Diff
85 lines
2.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Date: Thu, 11 Apr 2019 13:25:42 -0500
|
|
Subject: [PATCH] RH: attempt to get ANA info via sysfs first
|
|
|
|
When the ANA prioritizer is run, first see if the "ana_state" sysfs file
|
|
exists, and if it does, try to read the state from there. If that fails,
|
|
fallback to using an ioctl.
|
|
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
---
|
|
libmultipath/prioritizers/ana.c | 31 +++++++++++++++++++++++++++++--
|
|
1 file changed, 29 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/libmultipath/prioritizers/ana.c b/libmultipath/prioritizers/ana.c
|
|
index b5c7873d..e139360c 100644
|
|
--- a/libmultipath/prioritizers/ana.c
|
|
+++ b/libmultipath/prioritizers/ana.c
|
|
@@ -24,6 +24,7 @@
|
|
#include "prio.h"
|
|
#include "util.h"
|
|
#include "structs.h"
|
|
+#include "sysfs.h"
|
|
|
|
enum {
|
|
ANA_ERR_GETCTRL_FAILED = 1,
|
|
@@ -36,6 +37,7 @@ enum {
|
|
ANA_ERR_GETNS_FAILED,
|
|
ANA_ERR_NO_MEMORY,
|
|
ANA_ERR_NO_INFORMATION,
|
|
+ ANA_ERR_INVALID_STATE,
|
|
};
|
|
|
|
static const char *ana_errmsg[] = {
|
|
@@ -49,6 +51,7 @@ static const char *ana_errmsg[] = {
|
|
[ANA_ERR_GETNS_FAILED] = "couldn't get namespace info",
|
|
[ANA_ERR_NO_MEMORY] = "out of memory",
|
|
[ANA_ERR_NO_INFORMATION] = "invalid fd",
|
|
+ [ANA_ERR_INVALID_STATE] = "invalid state",
|
|
};
|
|
|
|
static const char *anas_string[] = {
|
|
@@ -107,6 +110,27 @@ static int get_ana_state(__u32 nsid, __u32 anagrpid, void *ana_log,
|
|
return -ANA_ERR_GETANAS_NOTFOUND;
|
|
}
|
|
|
|
+static int get_ana_info_sysfs(struct path *pp)
|
|
+{
|
|
+ char state[32];
|
|
+
|
|
+ if (!pp->udev || sysfs_attr_get_value(pp->udev, "ana_state", state,
|
|
+ sizeof(state)) <= 0)
|
|
+ return -ANA_ERR_NO_INFORMATION;
|
|
+
|
|
+ if (strcmp(state, "optimized") == 0)
|
|
+ return NVME_ANA_OPTIMIZED;
|
|
+ if (strcmp(state, "non-optimized") == 0)
|
|
+ return NVME_ANA_NONOPTIMIZED;
|
|
+ if (strcmp(state, "inaccessible") == 0)
|
|
+ return NVME_ANA_INACCESSIBLE;
|
|
+ if (strcmp(state, "persistent-loss") == 0)
|
|
+ return NVME_ANA_PERSISTENT_LOSS;
|
|
+ if (strcmp(state, "change") == 0)
|
|
+ return NVME_ANA_CHANGE;
|
|
+ return -ANA_ERR_INVALID_STATE;
|
|
+}
|
|
+
|
|
static int get_ana_info(struct path * pp)
|
|
{
|
|
int rc;
|
|
@@ -210,8 +234,11 @@ int getprio(struct path *pp, __attribute__((unused)) char *args,
|
|
|
|
if (pp->fd < 0)
|
|
rc = -ANA_ERR_NO_INFORMATION;
|
|
- else
|
|
- rc = get_ana_info(pp);
|
|
+ else {
|
|
+ rc = get_ana_info_sysfs(pp);
|
|
+ if (rc < 0)
|
|
+ rc = get_ana_info(pp);
|
|
+ }
|
|
|
|
switch (rc) {
|
|
case NVME_ANA_OPTIMIZED:
|