inference: gate [layout] diagnostic output on --verbose

Four plugins (dram_bound, kaslr_ceiling, phys_virt_synth,
riscv64_non_efi_phys_base) were printing unconditionally. Wrap
their fprintf calls in if (verbose && !quiet) to match the
convention used by all other inference plugins.

Author: bcoles

src/inference/dram_bound.c

@@ -70,10 +70,11 @@ static void dram_bound_run(struct kasld_analysis_ctx *ctx) {
 
     if (pdram_lo > phys_arch_min && pdram_lo > ctx->phys_base_min &&
         pdram_lo < ctx->phys_base_max) {
-      fprintf(stderr,
-              "[layout] phys_base_min tightened by dram_bound:"
-              " %#lx -> %#lx (min PHYS/DRAM=%#lx)\n",
-              ctx->phys_base_min, pdram_lo, pdram_lo);
+      if (verbose && !quiet)
+        fprintf(stderr,
+                "[layout] phys_base_min tightened by dram_bound:"
+                " %#lx -> %#lx (min PHYS/DRAM=%#lx)\n",
+                ctx->phys_base_min, pdram_lo, pdram_lo);
       ctx->phys_base_min = pdram_lo;
     }
   } else {
@@ -95,10 +96,11 @@ static void dram_bound_run(struct kasld_analysis_ctx *ctx) {
 
     if (virt_lo > kaslr_min && virt_lo > ctx->text_base_min &&
         virt_lo < ctx->text_base_max) {
-      fprintf(stderr,
-              "[layout] text_base_min tightened by dram_bound:"
-              " %#lx -> %#lx (min PHYS/DRAM=%#lx)\n",
-              ctx->text_base_min, virt_lo, pdram_lo);
+      if (verbose && !quiet)
+        fprintf(stderr,
+                "[layout] text_base_min tightened by dram_bound:"
+                " %#lx -> %#lx (min PHYS/DRAM=%#lx)\n",
+                ctx->text_base_min, virt_lo, pdram_lo);
       ctx->text_base_min = virt_lo;
     }
   }

src/inference/kaslr_ceiling.c

@@ -108,10 +108,11 @@ static void kaslr_ceiling_run(struct kasld_analysis_ctx *ctx) {
      * Align down to the nearest slot boundary. */
     unsigned long new_max = (kaslr_max - kernel_size) & ~(kaslr_align - 1);
     if (new_max > kaslr_min && new_max < ctx->text_base_max) {
-      fprintf(stderr,
-              "[layout] text_base_max tightened by kaslr_ceiling:"
-              " %#lx -> %#lx (kernel_size=%#lx)\n",
-              ctx->text_base_max, new_max, kernel_size);
+      if (verbose && !quiet)
+        fprintf(stderr,
+                "[layout] text_base_max tightened by kaslr_ceiling:"
+                " %#lx -> %#lx (kernel_size=%#lx)\n",
+                ctx->text_base_max, new_max, kernel_size);
       ctx->text_base_max = new_max;
     }
   }
@@ -124,10 +125,11 @@ static void kaslr_ceiling_run(struct kasld_analysis_ctx *ctx) {
   if (phys_max > phys_min && kernel_size < phys_max - phys_min) {
     unsigned long new_phys_max = (phys_max - kernel_size) & ~(phys_align - 1);
     if (new_phys_max > phys_min && new_phys_max < ctx->phys_base_max) {
-      fprintf(stderr,
-              "[layout] phys_base_max tightened by kaslr_ceiling:"
-              " %#lx -> %#lx (kernel_size=%#lx)\n",
-              ctx->phys_base_max, new_phys_max, kernel_size);
+      if (verbose && !quiet)
+        fprintf(stderr,
+                "[layout] phys_base_max tightened by kaslr_ceiling:"
+                " %#lx -> %#lx (kernel_size=%#lx)\n",
+                ctx->phys_base_max, new_phys_max, kernel_size);
       ctx->phys_base_max = new_phys_max;
     }
   }

src/inference/phys_virt_synth.c

@@ -126,17 +126,19 @@ static void phys_virt_synth_run(struct kasld_analysis_ctx *ctx) {
     return;
 
   if (cand_lo > ctx->page_offset_min) {
-    fprintf(stderr,
-            "[layout] page_offset_min tightened by phys_virt_synth:"
-            " %#lx -> %#lx\n",
-            ctx->page_offset_min, cand_lo);
+    if (verbose && !quiet)
+      fprintf(stderr,
+              "[layout] page_offset_min tightened by phys_virt_synth:"
+              " %#lx -> %#lx\n",
+              ctx->page_offset_min, cand_lo);
     ctx->page_offset_min = cand_lo;
   }
   if (cand_hi < ctx->page_offset_max) {
-    fprintf(stderr,
-            "[layout] page_offset_max tightened by phys_virt_synth:"
-            " %#lx -> %#lx\n",
-            ctx->page_offset_max, cand_hi);
+    if (verbose && !quiet)
+      fprintf(stderr,
+              "[layout] page_offset_max tightened by phys_virt_synth:"
+              " %#lx -> %#lx\n",
+              ctx->page_offset_max, cand_hi);
     ctx->page_offset_max = cand_hi;
   }
 }

src/inference/riscv64_non_efi_phys_base.c

@@ -82,12 +82,13 @@ static void riscv64_nonEFI_phys_base_run(struct kasld_analysis_ctx *ctx) {
   if (phys_exact < ctx->phys_base_min || phys_exact > ctx->phys_base_max)
     return;
 
-  fprintf(
-      stderr,
-      "[layout] phys_base pinned by riscv64_nonEFI_phys_base:"
-      " [%#lx, %#lx] -> %#lx (non-EFI, DRAM_BASE=%#lx + TEXT_OFFSET=%#lx)\n",
-      ctx->phys_base_min, ctx->phys_base_max, phys_exact, pdram_lo,
-      (unsigned long)TEXT_OFFSET);
+  if (verbose && !quiet)
+    fprintf(
+        stderr,
+        "[layout] phys_base pinned by riscv64_nonEFI_phys_base:"
+        " [%#lx, %#lx] -> %#lx (non-EFI, DRAM_BASE=%#lx + TEXT_OFFSET=%#lx)\n",
+        ctx->phys_base_min, ctx->phys_base_max, phys_exact, pdram_lo,
+        (unsigned long)TEXT_OFFSET);
   ctx->phys_base_min = phys_exact;
   ctx->phys_base_max = phys_exact;
 #else