Skip to contentSkip to conversation

Example of better reformatting Signed-off-by: Ben Evans <[email protected]>

PATCH New Ben Evans 3 participants 6 messages Aug 20, 2015 – Aug 21, 2015 Staging

lore
Share & tools
lore

Ben Evans

author
#0 lore raw

PATCH 1/1 Example of better reformatting Signed-off-by: Ben Evans <[email protected]>

I'm with James on the previous patch being ugly. Something like this is much cleaner. My opinion may not necessarily align with anyone elses.

---
 .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h    |   58 +++++++++-----------
 1 files changed, 26 insertions(+), 32 deletions(-)
drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h +26 -32
index f5d1d9f..cc4872d 100644
@@ -79,39 +79,33 @@
 #define IBLND_N_SCHED_HIGH		4
 
 typedef struct {
-	int          *kib_dev_failover;      /* HCA failover */
+	int *kib_dev_failover;      /* HCA failover */
 	unsigned int *kib_service;           /* IB service number */
-	int          *kib_min_reconnect_interval; /* first failed connection
-						   * retry... */
-	int          *kib_max_reconnect_interval; /* ...exponentially increasing
-						   * to this */
-	int          *kib_cksum;             /* checksum kib_msg_t? */
-	int          *kib_timeout;           /* comms timeout (seconds) */
-	int          *kib_keepalive;         /* keepalive timeout (seconds) */
-	int          *kib_ntx;               /* # tx descs */
-	int          *kib_credits;           /* # concurrent sends */
-	int          *kib_peertxcredits;     /* # concurrent sends to 1 peer */
-	int          *kib_peerrtrcredits;    /* # per-peer router buffer
-					      * credits */
-	int          *kib_peercredits_hiw;   /* # when eagerly to return
-					      * credits */
-	int          *kib_peertimeout;       /* seconds to consider peer dead */
-	char         **kib_default_ipif;     /* default IPoIB interface */
-	int          *kib_retry_count;
-	int          *kib_rnr_retry_count;
-	int          *kib_concurrent_sends;  /* send work queue sizing */
-	int          *kib_ib_mtu;            /* IB MTU */
-	int          *kib_map_on_demand;     /* map-on-demand if RD has more
-					      * fragments than this value, 0
-					      * disable map-on-demand */
-	int          *kib_pmr_pool_size;     /* # physical MR in pool */
-	int          *kib_fmr_pool_size;     /* # FMRs in pool */
-	int          *kib_fmr_flush_trigger; /* When to trigger FMR flush */
-	int          *kib_fmr_cache;         /* enable FMR pool cache? */
-	int          *kib_require_priv_port; /* accept only privileged ports */
-	int          *kib_use_priv_port;     /* use privileged port for active
-					      * connect */
-	int          *kib_nscheds;           /* # threads on each CPT */
+	int *kib_min_reconnect_interval; /* first failed connection retry */
+	int *kib_max_reconnect_interval; /* exponentially increase to this */
+	int *kib_cksum;             /* checksum kib_msg_t? */
+	int *kib_timeout;           /* comms timeout (seconds) */
+	int *kib_keepalive;         /* keepalive timeout (seconds) */
+	int *kib_ntx;               /* # tx descs */
+	int *kib_credits;           /* # concurrent sends */
+	int *kib_peertxcredits;     /* # concurrent sends to 1 peer */
+	int *kib_peerrtrcredits;    /* # per-peer router buffer credits */
+	int *kib_peercredits_hiw;   /* # when eagerly to return credits */
+	int *kib_peertimeout;       /* seconds to consider peer dead */
+	char **kib_default_ipif;     /* default IPoIB interface */
+	int *kib_retry_count;
+	int *kib_rnr_retry_count;
+	int *kib_concurrent_sends;  /* send work queue sizing */
+	int *kib_ib_mtu;            /* IB MTU */
+	int *kib_map_on_demand;     /* map-on-demand if RD has more fragments
+				       than this value, 0=disable */
+	int *kib_pmr_pool_size;     /* # physical MR in pool */
+	int *kib_fmr_pool_size;     /* # FMRs in pool */
+	int *kib_fmr_flush_trigger; /* When to trigger FMR flush */
+	int *kib_fmr_cache;         /* enable FMR pool cache? */
+	int *kib_require_priv_port; /* accept only privileged ports */
+	int *kib_use_priv_port;     /* use priv. port for active connect */
+	int *kib_nscheds;           /* # threads on each CPT */
 } kib_tunables_t;
 
 extern kib_tunables_t  kiblnd_tunables;
Signature · 1 line
1.6.5.6
#1 lore raw

PATCH 1/1 Example of better reformatting Signed-off-by: Ben Evans <[email protected]>

Quoted 1 line · Ben Evans

I'm with James on the previous patch being ugly. Something like this is much cleaner. My opinion may not necessarily align with anyone elses.

I am happy to resubmit following this idea, if that is preferred. Thanks.

-jeff

Quoted 74 lines
---
  .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h    |   58 +++++++++-----------
  1 files changed, 26 insertions(+), 32 deletions(-)
drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h +26 -32
index f5d1d9f..cc4872d 100644
@@ -79,39 +79,33 @@
  #define IBLND_N_SCHED_HIGH		4
 
  typedef struct {
-	int          *kib_dev_failover;      /* HCA failover */
+	int *kib_dev_failover;      /* HCA failover */
  	unsigned int *kib_service;           /* IB service number */
-	int          *kib_min_reconnect_interval; /* first failed connection
-						   * retry... */
-	int          *kib_max_reconnect_interval; /* ...exponentially increasing
-						   * to this */
-	int          *kib_cksum;             /* checksum kib_msg_t? */
-	int          *kib_timeout;           /* comms timeout (seconds) */
-	int          *kib_keepalive;         /* keepalive timeout (seconds) */
-	int          *kib_ntx;               /* # tx descs */
-	int          *kib_credits;           /* # concurrent sends */
-	int          *kib_peertxcredits;     /* # concurrent sends to 1 peer */
-	int          *kib_peerrtrcredits;    /* # per-peer router buffer
-					      * credits */
-	int          *kib_peercredits_hiw;   /* # when eagerly to return
-					      * credits */
-	int          *kib_peertimeout;       /* seconds to consider peer dead */
-	char         **kib_default_ipif;     /* default IPoIB interface */
-	int          *kib_retry_count;
-	int          *kib_rnr_retry_count;
-	int          *kib_concurrent_sends;  /* send work queue sizing */
-	int          *kib_ib_mtu;            /* IB MTU */
-	int          *kib_map_on_demand;     /* map-on-demand if RD has more
-					      * fragments than this value, 0
-					      * disable map-on-demand */
-	int          *kib_pmr_pool_size;     /* # physical MR in pool */
-	int          *kib_fmr_pool_size;     /* # FMRs in pool */
-	int          *kib_fmr_flush_trigger; /* When to trigger FMR flush */
-	int          *kib_fmr_cache;         /* enable FMR pool cache? */
-	int          *kib_require_priv_port; /* accept only privileged ports */
-	int          *kib_use_priv_port;     /* use privileged port for active
-					      * connect */
-	int          *kib_nscheds;           /* # threads on each CPT */
+	int *kib_min_reconnect_interval; /* first failed connection retry */
+	int *kib_max_reconnect_interval; /* exponentially increase to this */
+	int *kib_cksum;             /* checksum kib_msg_t? */
+	int *kib_timeout;           /* comms timeout (seconds) */
+	int *kib_keepalive;         /* keepalive timeout (seconds) */
+	int *kib_ntx;               /* # tx descs */
+	int *kib_credits;           /* # concurrent sends */
+	int *kib_peertxcredits;     /* # concurrent sends to 1 peer */
+	int *kib_peerrtrcredits;    /* # per-peer router buffer credits */
+	int *kib_peercredits_hiw;   /* # when eagerly to return credits */
+	int *kib_peertimeout;       /* seconds to consider peer dead */
+	char **kib_default_ipif;     /* default IPoIB interface */
+	int *kib_retry_count;
+	int *kib_rnr_retry_count;
+	int *kib_concurrent_sends;  /* send work queue sizing */
+	int *kib_ib_mtu;            /* IB MTU */
+	int *kib_map_on_demand;     /* map-on-demand if RD has more fragments
+				       than this value, 0=disable */
+	int *kib_pmr_pool_size;     /* # physical MR in pool */
+	int *kib_fmr_pool_size;     /* # FMRs in pool */
+	int *kib_fmr_flush_trigger; /* When to trigger FMR flush */
+	int *kib_fmr_cache;         /* enable FMR pool cache? */
+	int *kib_require_priv_port; /* accept only privileged ports */
+	int *kib_use_priv_port;     /* use priv. port for active connect */
+	int *kib_nscheds;           /* # threads on each CPT */
  } kib_tunables_t;
 
  extern kib_tunables_t  kiblnd_tunables;
author
#2 lore raw

PATCH 1/1 Example of better reformatting Signed-off-by: Ben Evans <[email protected]>

I?d get feedback from other parties first.

Quoted 92 lines · lustre-devel on behalf of Jeff Becker
Quoted 2 lines · Ben Evans

I'm with James on the previous patch being ugly. Something like this is much cleaner. My opinion may not necessarily align with anyone elses.

I am happy to resubmit following this idea, if that is preferred. Thanks.

-jeff

Quoted 70 lines
---
  .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h    |   58
+++++++++-----------
  1 files changed, 26 insertions(+), 32 deletions(-)
drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h +1 -4
index f5d1d9f..cc4872d 100644
@@ -79,39 +79,33 @@
  #define IBLND_N_SCHED_HIGH		4
 
  typedef struct {
-	int          *kib_dev_failover;      /* HCA failover */
+	int *kib_dev_failover;      /* HCA failover */
  	unsigned int *kib_service;           /* IB service number */
-	int          *kib_min_reconnect_interval; /* first failed connection
-						   * retry... */
-	int          *kib_max_reconnect_interval; /* ...exponentially

increasing

drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h +0 -7
-						   * to this */
-	int          *kib_cksum;             /* checksum kib_msg_t? */
-	int          *kib_timeout;           /* comms timeout (seconds) */
-	int          *kib_keepalive;         /* keepalive timeout (seconds) */
-	int          *kib_ntx;               /* # tx descs */
-	int          *kib_credits;           /* # concurrent sends */
-	int          *kib_peertxcredits;     /* # concurrent sends to 1 peer

*/

drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h +0 -5
-	int          *kib_peerrtrcredits;    /* # per-peer router buffer
-					      * credits */
-	int          *kib_peercredits_hiw;   /* # when eagerly to return
-					      * credits */
-	int          *kib_peertimeout;       /* seconds to consider peer dead

*/

drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h +0 -13
-	char         **kib_default_ipif;     /* default IPoIB interface */
-	int          *kib_retry_count;
-	int          *kib_rnr_retry_count;
-	int          *kib_concurrent_sends;  /* send work queue sizing */
-	int          *kib_ib_mtu;            /* IB MTU */
-	int          *kib_map_on_demand;     /* map-on-demand if RD has more
-					      * fragments than this value, 0
-					      * disable map-on-demand */
-	int          *kib_pmr_pool_size;     /* # physical MR in pool */
-	int          *kib_fmr_pool_size;     /* # FMRs in pool */
-	int          *kib_fmr_flush_trigger; /* When to trigger FMR flush */
-	int          *kib_fmr_cache;         /* enable FMR pool cache? */
-	int          *kib_require_priv_port; /* accept only privileged ports

*/

drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h +18 -3
-	int          *kib_use_priv_port;     /* use privileged port for active
-					      * connect */
-	int          *kib_nscheds;           /* # threads on each CPT */
+	int *kib_min_reconnect_interval; /* first failed connection retry */
+	int *kib_max_reconnect_interval; /* exponentially increase to this */
+	int *kib_cksum;             /* checksum kib_msg_t? */
+	int *kib_timeout;           /* comms timeout (seconds) */
+	int *kib_keepalive;         /* keepalive timeout (seconds) */
+	int *kib_ntx;               /* # tx descs */
+	int *kib_credits;           /* # concurrent sends */
+	int *kib_peertxcredits;     /* # concurrent sends to 1 peer */
+	int *kib_peerrtrcredits;    /* # per-peer router buffer credits */
+	int *kib_peercredits_hiw;   /* # when eagerly to return credits */
+	int *kib_peertimeout;       /* seconds to consider peer dead */
+	char **kib_default_ipif;     /* default IPoIB interface */
+	int *kib_retry_count;
+	int *kib_rnr_retry_count;
+	int *kib_concurrent_sends;  /* send work queue sizing */
+	int *kib_ib_mtu;            /* IB MTU */
+	int *kib_map_on_demand;     /* map-on-demand if RD has more fragments
+				       than this value, 0=disable */

drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h line 111

Quoted 10 lines
drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h +7 -0
+	int *kib_pmr_pool_size;     /* # physical MR in pool */
+	int *kib_fmr_pool_size;     /* # FMRs in pool */
+	int *kib_fmr_flush_trigger; /* When to trigger FMR flush */
+	int *kib_fmr_cache;         /* enable FMR pool cache? */
+	int *kib_require_priv_port; /* accept only privileged ports */
+	int *kib_use_priv_port;     /* use priv. port for active connect */
+	int *kib_nscheds;           /* # threads on each CPT */
  } kib_tunables_t;
 
  extern kib_tunables_t  kiblnd_tunables;

_______________________________________________
lustre-devel mailing list
lustre-devel at lists.lustre.org
http://lists.lustre.org/listinfo.cgi/lustre-devel-lustre.org

#3 lore raw

PATCH 1/1 Example of better reformatting Signed-off-by: Ben Evans <[email protected]>

In reply to Ben Evans
Quoted 2 lines · On 2015/08/20, 2:45 PM, "Ben Evans <[email protected]>" wrote:

I'm with James on the previous patch being ugly. Something like this is much cleaner. My opinion may not necessarily align with anyone elses.

I'd agree this is much better than the other patch, but you need to send this to Greg KH and fix the summary line for it to be accepted instead.

Cheers, Andreas

Quoted 84 lines

---
.../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h | 58
+++++++++-----------

1 files changed, 26 insertions(+), 32 deletions(-)
drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h +26 -32
index f5d1d9f..cc4872d 100644
@@ -79,39 +79,33 @@
 #define IBLND_N_SCHED_HIGH		4
 
 typedef struct {
-	int          *kib_dev_failover;      /* HCA failover */
+	int *kib_dev_failover;      /* HCA failover */
 	unsigned int *kib_service;           /* IB service number */
-	int          *kib_min_reconnect_interval; /* first failed connection
-						   * retry... */
-	int          *kib_max_reconnect_interval; /* ...exponentially increasing
-						   * to this */
-	int          *kib_cksum;             /* checksum kib_msg_t? */
-	int          *kib_timeout;           /* comms timeout (seconds) */
-	int          *kib_keepalive;         /* keepalive timeout (seconds) */
-	int          *kib_ntx;               /* # tx descs */
-	int          *kib_credits;           /* # concurrent sends */
-	int          *kib_peertxcredits;     /* # concurrent sends to 1 peer */
-	int          *kib_peerrtrcredits;    /* # per-peer router buffer
-					      * credits */
-	int          *kib_peercredits_hiw;   /* # when eagerly to return
-					      * credits */
-	int          *kib_peertimeout;       /* seconds to consider peer dead */
-	char         **kib_default_ipif;     /* default IPoIB interface */
-	int          *kib_retry_count;
-	int          *kib_rnr_retry_count;
-	int          *kib_concurrent_sends;  /* send work queue sizing */
-	int          *kib_ib_mtu;            /* IB MTU */
-	int          *kib_map_on_demand;     /* map-on-demand if RD has more
-					      * fragments than this value, 0
-					      * disable map-on-demand */
-	int          *kib_pmr_pool_size;     /* # physical MR in pool */
-	int          *kib_fmr_pool_size;     /* # FMRs in pool */
-	int          *kib_fmr_flush_trigger; /* When to trigger FMR flush */
-	int          *kib_fmr_cache;         /* enable FMR pool cache? */
-	int          *kib_require_priv_port; /* accept only privileged ports */
-	int          *kib_use_priv_port;     /* use privileged port for active
-					      * connect */
-	int          *kib_nscheds;           /* # threads on each CPT */
+	int *kib_min_reconnect_interval; /* first failed connection retry */
+	int *kib_max_reconnect_interval; /* exponentially increase to this */
+	int *kib_cksum;             /* checksum kib_msg_t? */
+	int *kib_timeout;           /* comms timeout (seconds) */
+	int *kib_keepalive;         /* keepalive timeout (seconds) */
+	int *kib_ntx;               /* # tx descs */
+	int *kib_credits;           /* # concurrent sends */
+	int *kib_peertxcredits;     /* # concurrent sends to 1 peer */
+	int *kib_peerrtrcredits;    /* # per-peer router buffer credits */
+	int *kib_peercredits_hiw;   /* # when eagerly to return credits */
+	int *kib_peertimeout;       /* seconds to consider peer dead */
+	char **kib_default_ipif;     /* default IPoIB interface */
+	int *kib_retry_count;
+	int *kib_rnr_retry_count;
+	int *kib_concurrent_sends;  /* send work queue sizing */
+	int *kib_ib_mtu;            /* IB MTU */
+	int *kib_map_on_demand;     /* map-on-demand if RD has more fragments
+				       than this value, 0=disable */
+	int *kib_pmr_pool_size;     /* # physical MR in pool */
+	int *kib_fmr_pool_size;     /* # FMRs in pool */
+	int *kib_fmr_flush_trigger; /* When to trigger FMR flush */
+	int *kib_fmr_cache;         /* enable FMR pool cache? */
+	int *kib_require_priv_port; /* accept only privileged ports */
+	int *kib_use_priv_port;     /* use priv. port for active connect */
+	int *kib_nscheds;           /* # threads on each CPT */
 } kib_tunables_t;
 
 extern kib_tunables_t  kiblnd_tunables;
Signature · 6 lines
1.6.5.6

_______________________________________________
lustre-devel mailing list
lustre-devel at lists.lustre.org
http://lists.lustre.org/listinfo.cgi/lustre-devel-lustre.org

Cheers, Andreas

Signature · 4 lines
Andreas Dilger

Lustre Software Architect
Intel High Performance Data Division
author
#4 lore raw

PATCH 1/1 Example of better reformatting Signed-off-by: Ben Evans <[email protected]>

Jeff, would you like to continue the patch along the lines I provided, or would you prefer I submit the patch, then you follow up?

-Ben

Quoted 106 lines · Andreas
Quoted 2 lines · On 2015/08/20, 2:45 PM, "Ben Evans <[email protected]>" wrote:

I'm with James on the previous patch being ugly. Something like this is much cleaner. My opinion may not necessarily align with anyone elses.

I'd agree this is much better than the other patch, but you need to send this to Greg KH and fix the summary line for it to be accepted instead.

Cheers, Andreas

Quoted 77 lines

---
.../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h | 58
+++++++++-----------

1 files changed, 26 insertions(+), 32 deletions(-)
drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h +1 -4
index f5d1d9f..cc4872d 100644
@@ -79,39 +79,33 @@
 #define IBLND_N_SCHED_HIGH		4
 
 typedef struct {
-	int          *kib_dev_failover;      /* HCA failover */
+	int *kib_dev_failover;      /* HCA failover */
 	unsigned int *kib_service;           /* IB service number */
-	int          *kib_min_reconnect_interval; /* first failed connection
-						   * retry... */
-	int          *kib_max_reconnect_interval; /* ...exponentially

increasing

drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h +0 -12
-						   * to this */
-	int          *kib_cksum;             /* checksum kib_msg_t? */
-	int          *kib_timeout;           /* comms timeout (seconds) */
-	int          *kib_keepalive;         /* keepalive timeout (seconds) */
-	int          *kib_ntx;               /* # tx descs */
-	int          *kib_credits;           /* # concurrent sends */
-	int          *kib_peertxcredits;     /* # concurrent sends to 1 peer */
-	int          *kib_peerrtrcredits;    /* # per-peer router buffer
-					      * credits */
-	int          *kib_peercredits_hiw;   /* # when eagerly to return
-					      * credits */
-	int          *kib_peertimeout;       /* seconds to consider peer dead

*/

drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h +25 -16
-	char         **kib_default_ipif;     /* default IPoIB interface */
-	int          *kib_retry_count;
-	int          *kib_rnr_retry_count;
-	int          *kib_concurrent_sends;  /* send work queue sizing */
-	int          *kib_ib_mtu;            /* IB MTU */
-	int          *kib_map_on_demand;     /* map-on-demand if RD has more
-					      * fragments than this value, 0
-					      * disable map-on-demand */
-	int          *kib_pmr_pool_size;     /* # physical MR in pool */
-	int          *kib_fmr_pool_size;     /* # FMRs in pool */
-	int          *kib_fmr_flush_trigger; /* When to trigger FMR flush */
-	int          *kib_fmr_cache;         /* enable FMR pool cache? */
-	int          *kib_require_priv_port; /* accept only privileged ports */
-	int          *kib_use_priv_port;     /* use privileged port for active
-					      * connect */
-	int          *kib_nscheds;           /* # threads on each CPT */
+	int *kib_min_reconnect_interval; /* first failed connection retry */
+	int *kib_max_reconnect_interval; /* exponentially increase to this */
+	int *kib_cksum;             /* checksum kib_msg_t? */
+	int *kib_timeout;           /* comms timeout (seconds) */
+	int *kib_keepalive;         /* keepalive timeout (seconds) */
+	int *kib_ntx;               /* # tx descs */
+	int *kib_credits;           /* # concurrent sends */
+	int *kib_peertxcredits;     /* # concurrent sends to 1 peer */
+	int *kib_peerrtrcredits;    /* # per-peer router buffer credits */
+	int *kib_peercredits_hiw;   /* # when eagerly to return credits */
+	int *kib_peertimeout;       /* seconds to consider peer dead */
+	char **kib_default_ipif;     /* default IPoIB interface */
+	int *kib_retry_count;
+	int *kib_rnr_retry_count;
+	int *kib_concurrent_sends;  /* send work queue sizing */
+	int *kib_ib_mtu;            /* IB MTU */
+	int *kib_map_on_demand;     /* map-on-demand if RD has more fragments
+				       than this value, 0=disable */
+	int *kib_pmr_pool_size;     /* # physical MR in pool */
+	int *kib_fmr_pool_size;     /* # FMRs in pool */
+	int *kib_fmr_flush_trigger; /* When to trigger FMR flush */
+	int *kib_fmr_cache;         /* enable FMR pool cache? */
+	int *kib_require_priv_port; /* accept only privileged ports */
+	int *kib_use_priv_port;     /* use priv. port for active connect */
+	int *kib_nscheds;           /* # threads on each CPT */

} kib_tunables_t;

Quoted 9 lines

extern kib_tunables_t kiblnd_tunables;

Signature · 6 lines
1.6.5.6

_______________________________________________
lustre-devel mailing list
lustre-devel at lists.lustre.org
http://lists.lustre.org/listinfo.cgi/lustre-devel-lustre.org

Cheers, Andreas

Signature · 4 lines
Andreas Dilger

Lustre Software Architect
Intel High Performance Data Division
#5 lore raw

PATCH 1/1 Example of better reformatting Signed-off-by: Ben Evans <[email protected]>

Hi Ben,

Quoted 2 lines · Ben Evans

Jeff, would you like to continue the patch along the lines I provided, or would you prefer I submit the patch, then you follow up?

Let me give it another try. Thanks.

-jeff

Quoted 113 lines

-Ben

Quoted 90 lines · Andreas
Quoted 2 lines · On 2015/08/20, 2:45 PM, "Ben Evans <[email protected]>" wrote:

I'm with James on the previous patch being ugly. Something like this is much cleaner. My opinion may not necessarily align with anyone elses.

I'd agree this is much better than the other patch, but you need to send this to Greg KH and fix the summary line for it to be accepted instead.

Cheers, Andreas

Quoted 81 lines

---
.../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h | 58
+++++++++-----------

1 files changed, 26 insertions(+), 32 deletions(-)
drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h +1 -4
index f5d1d9f..cc4872d 100644
@@ -79,39 +79,33 @@
 #define IBLND_N_SCHED_HIGH		4
 
 typedef struct {
-	int          *kib_dev_failover;      /* HCA failover */
+	int *kib_dev_failover;      /* HCA failover */
 	unsigned int *kib_service;           /* IB service number */
-	int          *kib_min_reconnect_interval; /* first failed connection
-						   * retry... */
-	int          *kib_max_reconnect_interval; /* ...exponentially

increasing

drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h +0 -12
-						   * to this */
-	int          *kib_cksum;             /* checksum kib_msg_t? */
-	int          *kib_timeout;           /* comms timeout (seconds) */
-	int          *kib_keepalive;         /* keepalive timeout (seconds) */
-	int          *kib_ntx;               /* # tx descs */
-	int          *kib_credits;           /* # concurrent sends */
-	int          *kib_peertxcredits;     /* # concurrent sends to 1 peer */
-	int          *kib_peerrtrcredits;    /* # per-peer router buffer
-					      * credits */
-	int          *kib_peercredits_hiw;   /* # when eagerly to return
-					      * credits */
-	int          *kib_peertimeout;       /* seconds to consider peer dead

*/

drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h +25 -16
-	char         **kib_default_ipif;     /* default IPoIB interface */
-	int          *kib_retry_count;
-	int          *kib_rnr_retry_count;
-	int          *kib_concurrent_sends;  /* send work queue sizing */
-	int          *kib_ib_mtu;            /* IB MTU */
-	int          *kib_map_on_demand;     /* map-on-demand if RD has more
-					      * fragments than this value, 0
-					      * disable map-on-demand */
-	int          *kib_pmr_pool_size;     /* # physical MR in pool */
-	int          *kib_fmr_pool_size;     /* # FMRs in pool */
-	int          *kib_fmr_flush_trigger; /* When to trigger FMR flush */
-	int          *kib_fmr_cache;         /* enable FMR pool cache? */
-	int          *kib_require_priv_port; /* accept only privileged ports */
-	int          *kib_use_priv_port;     /* use privileged port for active
-					      * connect */
-	int          *kib_nscheds;           /* # threads on each CPT */
+	int *kib_min_reconnect_interval; /* first failed connection retry */
+	int *kib_max_reconnect_interval; /* exponentially increase to this */
+	int *kib_cksum;             /* checksum kib_msg_t? */
+	int *kib_timeout;           /* comms timeout (seconds) */
+	int *kib_keepalive;         /* keepalive timeout (seconds) */
+	int *kib_ntx;               /* # tx descs */
+	int *kib_credits;           /* # concurrent sends */
+	int *kib_peertxcredits;     /* # concurrent sends to 1 peer */
+	int *kib_peerrtrcredits;    /* # per-peer router buffer credits */
+	int *kib_peercredits_hiw;   /* # when eagerly to return credits */
+	int *kib_peertimeout;       /* seconds to consider peer dead */
+	char **kib_default_ipif;     /* default IPoIB interface */
+	int *kib_retry_count;
+	int *kib_rnr_retry_count;
+	int *kib_concurrent_sends;  /* send work queue sizing */
+	int *kib_ib_mtu;            /* IB MTU */
+	int *kib_map_on_demand;     /* map-on-demand if RD has more fragments
+				       than this value, 0=disable */
+	int *kib_pmr_pool_size;     /* # physical MR in pool */
+	int *kib_fmr_pool_size;     /* # FMRs in pool */
+	int *kib_fmr_flush_trigger; /* When to trigger FMR flush */
+	int *kib_fmr_cache;         /* enable FMR pool cache? */
+	int *kib_require_priv_port; /* accept only privileged ports */
+	int *kib_use_priv_port;     /* use priv. port for active connect */
+	int *kib_nscheds;           /* # threads on each CPT */

} kib_tunables_t;

extern kib_tunables_t kiblnd_tunables;

Signature · 1 line
1.6.5.6
Quoted 14 lines
Quoted 5 lines

_______________________________________________
lustre-devel mailing list
lustre-devel at lists.lustre.org
http://lists.lustre.org/listinfo.cgi/lustre-devel-lustre.org

Cheers, Andreas

Signature · 4 lines
Andreas Dilger

Lustre Software Architect
Intel High Performance Data Division

_______________________________________________
lustre-devel mailing list
lustre-devel at lists.lustre.org
http://lists.lustre.org/listinfo.cgi/lustre-devel-lustre.org