From: Ivan Malov Date: Wed, 6 Jan 2021 10:05:59 +0000 (+0300) Subject: common/sfc_efx/base: fix MAE match spec validation helper X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=40f94ce9fa6217ba33cda0c42fd732b77aaf4791;p=dpdk.git common/sfc_efx/base: fix MAE match spec validation helper A particular FW version is aware of some set of match fields. Depending on FW configuration and match specification type, a known field may not necessarily be allowed to have a non-zero mask. FW communicates such restrictions via field capabilities MCDI. Newer FW may be aware of more fields. For such fields, older FW simply does not report any capabilities. A situation may occur when libefx is aware of a match field which the FW is unaware of (eg., older FW), that is, FW does not report capability status for this field. In this case, libefx must consider such field as unsupported and demand all-zeros mask for it when validating match specifications. Currently, the helper in question simply exits and reports that the specification is valid when it encounters a field with no capability status available. This is clearly wrong. Introduce the missing check to fix the problem. Fixes: 34285fd0891d ("common/sfc_efx/base: add match spec validate API") Cc: stable@dpdk.org Reviewed-by: Andy Moreton Reviewed-by: Andrew Rybchenko Signed-off-by: Ivan Malov --- diff --git a/drivers/common/sfc_efx/base/efx_mae.c b/drivers/common/sfc_efx/base/efx_mae.c index 22f29d454c..7fd42218f6 100644 --- a/drivers/common/sfc_efx/base/efx_mae.c +++ b/drivers/common/sfc_efx/base/efx_mae.c @@ -897,8 +897,17 @@ efx_mae_match_spec_is_valid( if (m_size == 0) continue; /* Skip array gap */ - if ((unsigned int)field_cap_id >= field_ncaps) - break; + if ((unsigned int)field_cap_id >= field_ncaps) { + /* + * The FW has not reported capability status for + * this field. Make sure that its mask is zeroed. + */ + is_valid = efx_mask_is_all_zeros(m_size, m_buf); + if (is_valid != B_FALSE) + continue; + else + break; + } switch (field_caps[field_cap_id].emfc_support) { case MAE_FIELD_SUPPORTED_MATCH_MASK: