Commit f29fa003 authored by Karsten Graul's avatar Karsten Graul Committed by Jakub Kicinski

net/smc: restore smcd_version when all ISM V2 devices failed to init

Field ini->smcd_version is set to SMC_V2 before calling
smc_listen_ism_init(). This clears the V1 bit that may be set. When all
matching ISM V2 devices fail to initialize then the smcd_version field
needs to get restored to allow any possible V1 devices to initialize.
And be consistent, always go to the not_found label when no device was
found.
Signed-off-by: default avatarKarsten Graul <kgraul@linux.ibm.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 9047a617
...@@ -1481,11 +1481,12 @@ static void smc_find_ism_v2_device_serv(struct smc_sock *new_smc, ...@@ -1481,11 +1481,12 @@ static void smc_find_ism_v2_device_serv(struct smc_sock *new_smc,
struct smc_clc_v2_extension *smc_v2_ext; struct smc_clc_v2_extension *smc_v2_ext;
struct smc_clc_msg_smcd *pclc_smcd; struct smc_clc_msg_smcd *pclc_smcd;
unsigned int matches = 0; unsigned int matches = 0;
u8 smcd_version;
u8 *eid = NULL; u8 *eid = NULL;
int i; int i;
if (!(ini->smcd_version & SMC_V2) || !smcd_indicated(ini->smc_type_v2)) if (!(ini->smcd_version & SMC_V2) || !smcd_indicated(ini->smc_type_v2))
return; goto not_found;
pclc_smcd = smc_get_clc_msg_smcd(pclc); pclc_smcd = smc_get_clc_msg_smcd(pclc);
smc_v2_ext = smc_get_clc_v2_ext(pclc); smc_v2_ext = smc_get_clc_v2_ext(pclc);
...@@ -1519,6 +1520,7 @@ static void smc_find_ism_v2_device_serv(struct smc_sock *new_smc, ...@@ -1519,6 +1520,7 @@ static void smc_find_ism_v2_device_serv(struct smc_sock *new_smc,
} }
/* separate - outside the smcd_dev_list.lock */ /* separate - outside the smcd_dev_list.lock */
smcd_version = ini->smcd_version;
for (i = 0; i < matches; i++) { for (i = 0; i < matches; i++) {
ini->smcd_version = SMC_V2; ini->smcd_version = SMC_V2;
ini->is_smcd = true; ini->is_smcd = true;
...@@ -1528,6 +1530,8 @@ static void smc_find_ism_v2_device_serv(struct smc_sock *new_smc, ...@@ -1528,6 +1530,8 @@ static void smc_find_ism_v2_device_serv(struct smc_sock *new_smc,
continue; continue;
return; /* matching and usable V2 ISM device found */ return; /* matching and usable V2 ISM device found */
} }
/* no V2 ISM device could be initialized */
ini->smcd_version = smcd_version; /* restore original value */
not_found: not_found:
ini->smcd_version &= ~SMC_V2; ini->smcd_version &= ~SMC_V2;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment