On Thu, 31 May 2012 07:56:17 -0400
Hal Rosenstock <h...@dev.mellanox.co.il> wrote:
> On 5/30/2012 6:15 PM, Jim Foraker wrote:
> > Defines a default for the smkey used in SA requests
> >
> > Signed-off-by: Jim Foraker <forak...@llnl.gov>
> > ---
> > etc/ibdiag.conf | 3 +++
> > src/ibdiag_common.c | 3 +++
> > 2 files changed, 6 insertions(+)
> >
> > diff --git a/etc/ibdiag.conf b/etc/ibdiag.conf
> > index 2a2334f..9686d14 100644
> > --- a/etc/ibdiag.conf
> > +++ b/etc/ibdiag.conf
> > @@ -17,3 +17,6 @@
> >
> > # define a default m_key
> > #m_key=0x00
> > +
> > +# default smkey to be used for SA requests
> > +#sa_key=0x00
>
> I think we're in for support questions here mostly around MCMemberRecord :-(
>
> If this is to be done, at a minimum, the change in admin expectation
> needs to be clearly documented in the infiniband-diags release notes.
> I'm not sure that's sufficient to have it noticed.
>
I will. Also I have added the following patch to document the default better.
Ira
infiniband-diags: saquery clarify default smkey option value
Signed-off-by: Ira Weiny <wei...@llnl.gov>
---
doc/rst/saquery.8.in.rst | 5 ++++-
src/saquery.c | 4 +++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/doc/rst/saquery.8.in.rst b/doc/rst/saquery.8.in.rst
index 79c8bd3..1a11965 100644
--- a/doc/rst/saquery.8.in.rst
+++ b/doc/rst/saquery.8.in.rst
@@ -82,7 +82,10 @@ OPTIONS
**--smkey <val>**
use SM_Key value for the query. Will be used only with "trusted"
queries. If non-numeric value (like 'x') is specified then saquery
- will prompt for a value.
+ will prompt for a value.
+ Default (when not specified here or in
+ @IBDIAG_CONFIG_PATH@/ibdiag.conf) is to use SM_Key == 0 (or
+ \"untrusted\")
.. include:: common/opt_K.rst
diff --git a/src/saquery.c b/src/saquery.c
index 5f535fc..6e09374 100644
--- a/src/saquery.c
+++ b/src/saquery.c
@@ -1571,7 +1571,9 @@ int main(int argc, char **argv)
{"smkey", 4, 1, "<val>",
"SA SM_Key value for the query."
" If non-numeric value (like 'x') is specified then"
- " saquery will prompt for a value"},
+ " saquery will prompt for a value. "
+ " Default (when not specified here or in ibdiag.conf) is to "
+ " use SM_Key == 0 (or \"untrusted\")"},
{"slid", 5, 1, "<lid>", "Source LID (PathRecord)"},
{"dlid", 6, 1, "<lid>", "Destination LID (PathRecord)"},
{"mlid", 7, 1, "<lid>", "Multicast LID (MCMemberRecord)"},
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
