Re: svn commit: r302163 - in head/sys: cam conf

[Jan Beich]

Warner Losh  writes:

> Author: imp
> Date: Thu Jun 23 23:20:58 2016
> New Revision: 302163
> URL: https://svnweb.freebsd.org/changeset/base/302163
>
> Log:
>   Rename CAM_NETFLIX_IOSCHED to CAM_IOSCHED_DYNAMIC to better reflect
>   its nature.
>   
>   Approved by: re
>   Reviewed By: jhb
>   Differential Revision: https://reviews.freebsd.org/D6811

Do you plan to rename kern.cam.do_netflix_iosched sysctl as well?


signature.asc
Description: PGP signature

svn commit: r302163 - in head/sys: cam conf

[Warner Losh]

Author: imp
Date: Thu Jun 23 23:20:58 2016
New Revision: 302163
URL: https://svnweb.freebsd.org/changeset/base/302163

Log:
  Rename CAM_NETFLIX_IOSCHED to CAM_IOSCHED_DYNAMIC to better reflect
  its nature.
  
  Approved by: re
  Reviewed By: jhb
  Differential Revision: https://reviews.freebsd.org/D6811

Modified:
  head/sys/cam/cam_iosched.c
  head/sys/conf/options

Modified: head/sys/cam/cam_iosched.c
==
--- head/sys/cam/cam_iosched.c  Thu Jun 23 23:13:14 2016(r302162)
+++ head/sys/cam/cam_iosched.c  Thu Jun 23 23:20:58 2016(r302163)
@@ -61,7 +61,7 @@ static MALLOC_DEFINE(M_CAMSCHED, "CAM I/
  * for trims.
  */
 
-#ifdef CAM_NETFLIX_IOSCHED
+#ifdef CAM_IOSCHED_DYNAMIC
 
 static int do_netflix_iosched = 1;
 TUNABLE_INT("kern.cam.do_netflix_iosched", _netflix_iosched);
@@ -250,7 +250,7 @@ struct cam_iosched_softc
/* scheduler flags < 16, user flags >= 16 */
uint32_tflags;
int sort_io_queue;
-#ifdef CAM_NETFLIX_IOSCHED
+#ifdef CAM_IOSCHED_DYNAMIC
int read_bias;  /* Read bias setting */
int current_read_bias;  /* Current read bias state */
int total_ticks;
@@ -269,7 +269,7 @@ struct cam_iosched_softc
 #endif
 };
 
-#ifdef CAM_NETFLIX_IOSCHED
+#ifdef CAM_IOSCHED_DYNAMIC
 /*
  * helper functions to call the limsw functions.
  */
@@ -624,7 +624,7 @@ cam_iosched_cl_maybe_steer(struct contro
/* Periph drivers set these flags to indicate work */
 #define CAM_IOSCHED_FLAG_WORK_FLAGS((0xu) << 16)
 
-#ifdef CAM_NETFLIX_IOSCHED
+#ifdef CAM_IOSCHED_DYNAMIC
 static void
 cam_iosched_io_metric_update(struct cam_iosched_softc *isc,
 sbintime_t sim_latency, int cmd, size_t size);
@@ -639,7 +639,7 @@ cam_iosched_has_flagged_work(struct cam_
 static inline int
 cam_iosched_has_io(struct cam_iosched_softc *isc)
 {
-#ifdef CAM_NETFLIX_IOSCHED
+#ifdef CAM_IOSCHED_DYNAMIC
if (do_netflix_iosched) {
struct bio *rbp = bioq_first(>bio_queue);
struct bio *wbp = bioq_first(>write_queue);
@@ -672,7 +672,7 @@ cam_iosched_has_more_trim(struct cam_ios
 static inline int
 cam_iosched_has_work(struct cam_iosched_softc *isc)
 {
-#ifdef CAM_NETFLIX_IOSCHED
+#ifdef CAM_IOSCHED_DYNAMIC
if (iosched_debug > 2)
printf("has work: %d %d %d\n", cam_iosched_has_io(isc),
cam_iosched_has_more_trim(isc),
@@ -684,7 +684,7 @@ cam_iosched_has_work(struct cam_iosched_
cam_iosched_has_flagged_work(isc);
 }
 
-#ifdef CAM_NETFLIX_IOSCHED
+#ifdef CAM_IOSCHED_DYNAMIC
 static void
 cam_iosched_iop_stats_init(struct cam_iosched_softc *isc, struct iop_stats 
*ios)
 {
@@ -946,14 +946,14 @@ cam_iosched_init(struct cam_iosched_soft
*iscp = malloc(sizeof(**iscp), M_CAMSCHED, M_NOWAIT | M_ZERO);
if (*iscp == NULL)
return ENOMEM;
-#ifdef CAM_NETFLIX_IOSCHED
+#ifdef CAM_IOSCHED_DYNAMIC
if (iosched_debug)
printf("CAM IOSCHEDULER Allocating entry at %p\n", *iscp);
 #endif
(*iscp)->sort_io_queue = -1;
bioq_init(&(*iscp)->bio_queue);
bioq_init(&(*iscp)->trim_queue);
-#ifdef CAM_NETFLIX_IOSCHED
+#ifdef CAM_IOSCHED_DYNAMIC
if (do_netflix_iosched) {
bioq_init(&(*iscp)->write_queue);
(*iscp)->read_bias = 100;
@@ -984,7 +984,7 @@ cam_iosched_fini(struct cam_iosched_soft
 {
if (isc) {
cam_iosched_flush(isc, NULL, ENXIO);
-#ifdef CAM_NETFLIX_IOSCHED
+#ifdef CAM_IOSCHED_DYNAMIC
cam_iosched_iop_stats_fini(>read_stats);
cam_iosched_iop_stats_fini(>write_stats);
cam_iosched_iop_stats_fini(>trim_stats);
@@ -1009,7 +1009,7 @@ cam_iosched_fini(struct cam_iosched_soft
 void cam_iosched_sysctl_init(struct cam_iosched_softc *isc,
 struct sysctl_ctx_list *ctx, struct sysctl_oid *node)
 {
-#ifdef CAM_NETFLIX_IOSCHED
+#ifdef CAM_IOSCHED_DYNAMIC
struct sysctl_oid_list *n;
 #endif
 
@@ -1018,7 +1018,7 @@ void cam_iosched_sysctl_init(struct cam_
>sort_io_queue, 0,
"Sort IO queue to try and optimise disk access patterns");
 
-#ifdef CAM_NETFLIX_IOSCHED
+#ifdef CAM_IOSCHED_DYNAMIC
if (!do_netflix_iosched)
return;
 
@@ -1060,13 +1060,13 @@ cam_iosched_flush(struct cam_iosched_sof
 {
bioq_flush(>bio_queue, stp, err);
bioq_flush(>trim_queue, stp, err);
-#ifdef CAM_NETFLIX_IOSCHED
+#ifdef CAM_IOSCHED_DYNAMIC
if (do_netflix_iosched)
bioq_flush(>write_queue, stp, err);
 #endif
 }
 
-#ifdef CAM_NETFLIX_IOSCHED
+#ifdef CAM_IOSCHED_DYNAMIC
 static struct bio *
 cam_iosched_get_write(struct cam_iosched_softc *isc)
 {
@@ -1132,7 +1132,7 @@ void
 cam_iosched_put_back_trim(struct cam_iosched_softc *isc, struct bio *bp)
 {