Skip to contentSkip to conversation

x86: address some violations of MISRA C Rule 16.3

PATCH Superseded Federico Serafini 3 participants 20 messages Jul 15, 2024 – Jul 24, 2024

v4 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

v4 cover x86: address some violations of MISRA C Rule 16.3

This patch series fixes a missing escape in a deviation and addresses some violations.

Federico Serafini (9):
automation/eclair: fix deviation of MISRA C Rule 16.3 x86/cpuid: use fallthrough pseudo keyword x86/domctl: address a violation of MISRA C Rule 16.3 x86/vpmu: address violations of MISRA C Rule 16.3 x86/traps: address violations of MISRA C Rule 16.3 x86/mce: address violations of MISRA C Rule 16.3 x86/hvm: address violations of MISRA C Rule 16.3 x86/mm: add defensive return
x86/mpparse: address a violation of MISRA C Rule 16.3

 automation/eclair_analysis/ECLAIR/deviations.ecl |  2 +-
 xen/arch/x86/cpu/mcheck/mce_amd.c                |  1 +
 xen/arch/x86/cpu/mcheck/mce_intel.c              |  2 ++
 xen/arch/x86/cpu/vpmu.c                          |  3 +++
 xen/arch/x86/cpu/vpmu_intel.c                    |  2 ++
 xen/arch/x86/cpuid.c                             |  3 +--
 xen/arch/x86/domctl.c                            |  1 +
 xen/arch/x86/hvm/emulate.c                       | 10 ++++++----
 xen/arch/x86/hvm/hvm.c                           |  5 +++++
 xen/arch/x86/hvm/hypercall.c                     |  2 +-
 xen/arch/x86/hvm/irq.c                           |  1 +
 xen/arch/x86/hvm/pmtimer.c                       |  1 +
 xen/arch/x86/hvm/svm/svm.c                       |  2 ++
 xen/arch/x86/hvm/vlapic.c                        |  1 +
 xen/arch/x86/hvm/vmx/vmcs.c                      |  2 ++
 xen/arch/x86/hvm/vmx/vmx.c                       |  3 ++-
 xen/arch/x86/hvm/vmx/vvmx.c                      |  1 +
 xen/arch/x86/hvm/vpic.c                          |  1 +
 xen/arch/x86/hvm/vpt.c                           |  3 +--
 xen/arch/x86/mm.c                                |  1 +
 xen/arch/x86/mpparse.c                           |  1 +
 xen/arch/x86/traps.c                             |  3 +++
 22 files changed, 40 insertions(+), 11 deletions(-)
Signature · 1 line
2.34.1
#1 lore raw

PATCH v4 1/9 automation/eclair: fix deviation of MISRA C Rule 16.3

Escape the final dot of the comment and extend the search of a fallthrough comment up to 2 lines after the last statement.

Fixes Fixes: a128d8da91 ("automation/eclair: add deviations for MISRA C:2012 Rule 16.3")
---
 automation/eclair_analysis/ECLAIR/deviations.ecl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
automation/eclair_analysis/ECLAIR/deviations.ecl +1 -1
index 0d94635275..e95554acae 100644
@@ -499,7 +499,7 @@ safe."
 -doc_end
 
 -doc_begin="Switch clauses ending with an explicit comment indicating the fallthrough intention are safe."
--config=MC3R1.R16.3,reports+={safe, "any_area(end_loc(any_exp(text(^(?s).*/\\* [fF]all ?through.? \\*/.*$,0..1))))"}
+-config=MC3R1.R16.3,reports+={safe, "any_area(end_loc(any_exp(text(^(?s).*/\\* [fF]all ?through\\.? \\*/.*$,0..2))))"}
 -doc_end
 
 -doc_begin="Switch statements having a controlling expression of enum type deliberately do not have a default case: gcc -Wall enables -Wswitch which warns (and breaks the build as we use -Werror) if one of the enum labels is missing from the switch."
Signature · 1 line
2.34.1
#2 lore raw

Re: [XEN PATCH v4 1/9] automation/eclair: fix deviation of MISRA C Rule 16.3

automation/eclair_analysis/ECLAIR/deviations.ecl safe." · line 505

Quoted 11 lines · Federico Serafini
automation/eclair_analysis/ECLAIR/deviations.ecl +1 -1
@@ -499,7 +499,7 @@ safe."
 -doc_end
 
 -doc_begin="Switch clauses ending with an explicit comment indicating the fallthrough intention are safe."
--config=MC3R1.R16.3,reports+={safe, "any_area(end_loc(any_exp(text(^(?s).*/\\* [fF]all ?through.? \\*/.*$,0..1))))"}
+-config=MC3R1.R16.3,reports+={safe, "any_area(end_loc(any_exp(text(^(?s).*/\\* [fF]all ?through\\.? \\*/.*$,0..2))))"}
 -doc_end
 
 -doc_begin="Switch statements having a controlling expression of enum type deliberately do not have a default case: gcc -Wall enables -Wswitch which warns (and breaks the build as we use -Werror) if one of the enum labels is missing from the switch."

This patch doesn't apply. There's a somewhat similar entry, but its doc_begin line is sufficiently different. I have no idea what's going on here; there's no dependency stated anywhere.

Jan

#3 lore raw

Re: [XEN PATCH v4 1/9] automation/eclair: fix deviation of MISRA C Rule 16.3

Quoted 11 lines · Jan Beulich
Quoted 10 lines · Federico Serafini
automation/eclair_analysis/ECLAIR/deviations.ecl +1 -1
@@ -499,7 +499,7 @@ safe."
  -doc_end
 
  -doc_begin="Switch clauses ending with an explicit comment indicating the fallthrough intention are safe."
--config=MC3R1.R16.3,reports+={safe, "any_area(end_loc(any_exp(text(^(?s).*/\\* [fF]all ?through.? \\*/.*$,0..1))))"}
+-config=MC3R1.R16.3,reports+={safe, "any_area(end_loc(any_exp(text(^(?s).*/\\* [fF]all ?through\\.? \\*/.*$,0..2))))"}
  -doc_end
 
Quoted 5 lines

automation/eclair_analysis/ECLAIR/deviations.ecl safe." · line 505

Quoted 1 line
automation/eclair_analysis/ECLAIR/deviations.ecl +0 -0
  -doc_begin="Switch statements having a controlling expression of enum type deliberately do not have a default case: gcc -Wall enables -Wswitch which warns (and breaks the build as we use -Werror) if one of the enum labels is missing from the switch."

This patch doesn't apply. There's a somewhat similar entry, but its doc_begin line is sufficiently different. I have no idea what's going on here; there's no dependency stated anywhere.

Right, this patch depends on [1] which has not been committed yet.

[1]
https://lists.xenproject.org/archives/html/xen-devel/2024-06/msg01347.html

Signature · 3 lines
Federico Serafini, M.Sc.

Software Engineer, BUGSENG (http://bugseng.com)
#4 lore raw

Re: [XEN PATCH v4 1/9] automation/eclair: fix deviation of MISRA C Rule 16.3

Quoted 18 lines · Federico Serafini
Quoted 11 lines · Jan Beulich
Quoted 10 lines · Federico Serafini
automation/eclair_analysis/ECLAIR/deviations.ecl +1 -1
@@ -499,7 +499,7 @@ safe."
  -doc_end
 
  -doc_begin="Switch clauses ending with an explicit comment indicating the fallthrough intention are safe."
--config=MC3R1.R16.3,reports+={safe, "any_area(end_loc(any_exp(text(^(?s).*/\\* [fF]all ?through.? \\*/.*$,0..1))))"}
+-config=MC3R1.R16.3,reports+={safe, "any_area(end_loc(any_exp(text(^(?s).*/\\* [fF]all ?through\\.? \\*/.*$,0..2))))"}
  -doc_end
 
Quoted 5 lines

automation/eclair_analysis/ECLAIR/deviations.ecl safe." · line 505

Quoted 1 line
automation/eclair_analysis/ECLAIR/deviations.ecl +0 -0
  -doc_begin="Switch statements having a controlling expression of enum type deliberately do not have a default case: gcc -Wall enables -Wswitch which warns (and breaks the build as we use -Werror) if one of the enum labels is missing from the switch."

This patch doesn't apply. There's a somewhat similar entry, but its doc_begin line is sufficiently different. I have no idea what's going on here; there's no dependency stated anywhere.

Quoted 4 lines

Right, this patch depends on [1] which has not been committed yet.

[1]
https://lists.xenproject.org/archives/html/xen-devel/2024-06/msg01347.html

Which in turn isn't ready to be committed yet afaict, due to a pending question regarding ASSERT_UNREACHABLE().

In any event - please make sure you prominently state dependencies on uncommitted patches (outside of the same series of course).

Jan

#5 lore raw

PATCH v4 2/9 x86/cpuid: use fallthrough pseudo keyword

In reply to Federico Serafini

The current comment making explicit the fallthrough intention does not follow the agreed syntax: replace it with the pseduo keyword.

No functional change.

---
 xen/arch/x86/cpuid.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
xen/arch/x86/cpuid.c +1 -2
index a822e80c7e..2a777436ee 100644
@@ -97,9 +97,8 @@ void guest_cpuid(const struct vcpu *v, uint32_t leaf,
         if ( is_viridian_domain(d) )
             return cpuid_viridian_leaves(v, leaf, subleaf, res);
 
+        fallthrough;
         /*
-         * Fallthrough.
-         *
          * Intel reserve up until 0x4fffffff for hypervisor use.  AMD reserve
          * only until 0x400000ff, but we already use double that.
          */
Signature · 1 line
2.34.1
#6 lore raw

PATCH v4 3/9 x86/domctl: address a violation of MISRA C Rule 16.3

In reply to Federico Serafini

Add missing break statement to address a violation of
MISRA C Rule 16.3: "An unconditional `break' statement shall terminate every switch-clause".

No functional change.

---
 xen/arch/x86/domctl.c | 1 +
 1 file changed, 1 insertion(+)
xen/arch/x86/domctl.c +1 -0
index 9190e11faa..68b5b46d1a 100644
@@ -517,6 +517,7 @@ long arch_do_domctl(
 
         default:
             ret = -ENOSYS;
+            break;
         }
         break;
     }
Signature · 1 line
2.34.1
#7 lore raw

PATCH v4 4/9 x86/vpmu: address violations of MISRA C Rule 16.3

In reply to Federico Serafini

Add missing break statements to address violations of MISRA C Rule 16.3: "An unconditional `break' statement shall terminate every switch-clause".

No functional change.

---
 xen/arch/x86/cpu/vpmu.c       | 3 +++
 xen/arch/x86/cpu/vpmu_intel.c | 2 ++
 2 files changed, 5 insertions(+)
xen/arch/x86/cpu/vpmu.c +3 -0
index a7bc0cd1fc..b2ba999412 100644
@@ -663,6 +663,8 @@ long do_xenpmu_op(
 
         if ( pmu_params.version.maj != XENPMU_VER_MAJ )
             return -EINVAL;
+
+        break;
     }
 
     switch ( op )
@@ -776,6 +778,7 @@ long do_xenpmu_op(
 
     default:
         ret = -EINVAL;
+        break;
     }
 
     return ret;
xen/arch/x86/cpu/vpmu_intel.c +2 -0
index cd414165df..26dd3a9358 100644
@@ -666,6 +666,7 @@ static int cf_check core2_vpmu_do_wrmsr(unsigned int msr, uint64_t msr_content)
 
             xen_pmu_cntr_pair[tmp].control = msr_content;
         }
+        break;
     }
 
     if ( type != MSR_TYPE_GLOBAL )
@@ -713,6 +714,7 @@ static int cf_check core2_vpmu_do_rdmsr(unsigned int msr, uint64_t *msr_content)
             break;
         default:
             rdmsrl(msr, *msr_content);
+            break;
         }
     }
     else if ( msr == MSR_IA32_MISC_ENABLE )
Signature · 1 line
2.34.1
#9 lore raw

PATCH v4 5/9 x86/traps: address violations of MISRA C Rule 16.3

In reply to Federico Serafini

Add break or pseudo keyword fallthrough to address violations of MISRA C Rule 16.3: "An unconditional `break' statement shall terminate every switch-clause".

No functional change.

---
 xen/arch/x86/traps.c | 3 +++
 1 file changed, 3 insertions(+)
xen/arch/x86/traps.c +3 -0
index ee91fc56b1..7a9299ae6c 100644
@@ -1186,6 +1186,7 @@ void cpuid_hypervisor_leaves(const struct vcpu *v, uint32_t leaf,
 
     default:
         ASSERT_UNREACHABLE();
+        break;
     }
 }
 
@@ -1748,6 +1749,7 @@ static void io_check_error(const struct cpu_user_regs *regs)
     {
     case 'd': /* 'dom0' */
         nmi_hwdom_report(_XEN_NMIREASON_io_error);
+        break;
     case 'i': /* 'ignore' */
         break;
     default:  /* 'fatal' */
@@ -1768,6 +1770,7 @@ static void unknown_nmi_error(const struct cpu_user_regs *regs,
     {
     case 'd': /* 'dom0' */
         nmi_hwdom_report(_XEN_NMIREASON_unknown);
+        break;
     case 'i': /* 'ignore' */
         break;
     default:  /* 'fatal' */
Signature · 1 line
2.34.1
#10 lore raw

Re: [XEN PATCH v4 5/9] x86/traps: address violations of MISRA C Rule 16.3

Quoted 8 lines · Federico Serafini

Add break or pseudo keyword fallthrough to address violations of MISRA C Rule 16.3: "An unconditional `break' statement shall terminate every switch-clause".

No functional change.

And my A-b was lost? Please can you be more diligent in collecting tags, helping committers?

Jan

#11 lore raw

Re: [XEN PATCH v4 5/9] x86/traps: address violations of MISRA C Rule 16.3

Quoted 5 lines · Jan Beulich
Quoted 4 lines · Federico Serafini

Add break or pseudo keyword fallthrough to address violations of MISRA C Rule 16.3: "An unconditional `break' statement shall terminate every switch-clause".

Quoted 7 lines
Quoted 4 lines

No functional change.

And my A-b was lost? Please can you be more diligent in collecting tags, helping committers?

You are right, sorry Jan.

Signature · 3 lines
Federico Serafini, M.Sc.

Software Engineer, BUGSENG (http://bugseng.com)
#12 lore raw

PATCH v4 6/9 x86/mce: address violations of MISRA C Rule 16.3

In reply to Federico Serafini

Add missing break statements to address violations of
MISRA C Rule 16.3: "An unconditional `break' statement shall terminate every switch-clause".

No functional change.

---
 xen/arch/x86/cpu/mcheck/mce_amd.c   | 1 +
 xen/arch/x86/cpu/mcheck/mce_intel.c | 2 ++
 2 files changed, 3 insertions(+)
xen/arch/x86/cpu/mcheck/mce_amd.c +1 -0
index 3318b8204f..4f06a3153b 100644
@@ -201,6 +201,7 @@ static void mcequirk_amd_apply(enum mcequirk_amd_flags flags)
 
     default:
         ASSERT(flags == MCEQUIRK_NONE);
+        break;
     }
 }
 
xen/arch/x86/cpu/mcheck/mce_intel.c +2 -0
index dd812f4b8a..9574dedbfd 100644
@@ -896,6 +896,8 @@ static void intel_init_ppin(const struct cpuinfo_x86 *c)
             ppin_msr = 0;
         else if ( c == &boot_cpu_data )
             ppin_msr = MSR_PPIN;
+
+        break;
     }
 }
 
Signature · 1 line
2.34.1
#13 lore raw

PATCH v4 7/9 x86/hvm: address violations of MISRA C Rule 16.3

In reply to Federico Serafini

MISRA C Rule 16.3 states that "An unconditional `break' statement shall terminate every switch-clause".

Add pseudo keyword fallthrough or missing break statement to address violations of the rule.

As a defensive measure, return an error message or a null pointer in case an unreachable return statement is reached.

---
Changes in v4:
- do not separate different parts of HVM:

    a) squash patches 8, 11 and 12 of v3 into this patch;
    b) address also violations of SVM and VMX;

- re-arrange fallthrough positioning to comply with Coverity. Changes in v3:
- squashed here modifications of pmtimer.c;
- no blank line after fallthrough;
- better indentation of fallthrough.

---
 xen/arch/x86/hvm/emulate.c   | 10 ++++++----
 xen/arch/x86/hvm/hvm.c       |  5 +++++
 xen/arch/x86/hvm/hypercall.c |  2 +-
 xen/arch/x86/hvm/irq.c       |  1 +
 xen/arch/x86/hvm/pmtimer.c   |  1 +
 xen/arch/x86/hvm/svm/svm.c   |  2 ++
 xen/arch/x86/hvm/vlapic.c    |  1 +
 xen/arch/x86/hvm/vmx/vmcs.c  |  2 ++
 xen/arch/x86/hvm/vmx/vmx.c   |  3 ++-
 xen/arch/x86/hvm/vmx/vvmx.c  |  1 +
 xen/arch/x86/hvm/vpic.c      |  1 +
 xen/arch/x86/hvm/vpt.c       |  3 +--
 12 files changed, 24 insertions(+), 8 deletions(-)
xen/arch/x86/hvm/emulate.c +6 -4
index 02e378365b..a749d16137 100644
@@ -339,7 +339,7 @@ static int hvmemul_do_io(
     }
     case X86EMUL_UNIMPLEMENTED:
         ASSERT_UNREACHABLE();
-        /* Fall-through */
+        fallthrough;
     default:
         BUG();
     }
@@ -397,7 +397,6 @@ static int hvmemul_acquire_page(unsigned long gmfn, struct page_info **page)
     default:
         ASSERT_UNREACHABLE();
         /* Fallthrough */
-
     case -EINVAL:
         return X86EMUL_UNHANDLEABLE;
     }
@@ -2674,6 +2673,7 @@ static int _hvm_emulate_one(struct hvm_emulate_ctxt *hvmemul_ctxt,
 
     default:
         ASSERT_UNREACHABLE();
+        break;
     }
 
     if ( hvmemul_ctxt->ctxt.retire.singlestep )
@@ -2764,6 +2764,7 @@ int hvm_emulate_one_mmio(unsigned long mfn, unsigned long gla)
         /* fallthrough */
     default:
         hvm_emulate_writeback(&ctxt);
+        break;
     }
 
     return rc;
@@ -2799,10 +2800,11 @@ void hvm_emulate_one_vm_event(enum emul_kind kind, unsigned int trapnr,
         memcpy(hvio->mmio_insn, curr->arch.vm_event->emul.insn.data,
                hvio->mmio_insn_bytes);
     }
-    /* Fall-through */
+        fallthrough;
     default:
         ctx.set_context = (kind == EMUL_KIND_SET_CONTEXT_DATA);
         rc = hvm_emulate_one(&ctx, VIO_no_completion);
+        break;
     }
 
     switch ( rc )
@@ -2818,7 +2820,7 @@ void hvm_emulate_one_vm_event(enum emul_kind kind, unsigned int trapnr,
     case X86EMUL_UNIMPLEMENTED:
         if ( hvm_monitor_emul_unimplemented() )
             return;
-        /* fall-through */
+        fallthrough;
     case X86EMUL_UNHANDLEABLE:
         hvm_dump_emulation_state(XENLOG_G_DEBUG, "Mem event", &ctx, rc);
         hvm_inject_hw_exception(trapnr, errcode);
xen/arch/x86/hvm/hvm.c +5 -0
index 7f4b627b1f..d7f195ba9a 100644
@@ -4919,6 +4919,8 @@ static int do_altp2m_op(
 
     default:
         ASSERT_UNREACHABLE();
+        rc = -EOPNOTSUPP;
+        break;
     }
 
  out:
@@ -5020,6 +5022,8 @@ static int compat_altp2m_op(
 
     default:
         ASSERT_UNREACHABLE();
+        rc = -EOPNOTSUPP;
+        break;
     }
 
     return rc;
@@ -5283,6 +5287,7 @@ void hvm_get_segment_register(struct vcpu *v, enum x86_segment seg,
          * %cs and %tr are unconditionally present.  SVM ignores these present
          * bits and will happily run without them set.
          */
+        fallthrough;
     case x86_seg_cs:
         reg->p = 1;
         break;
xen/arch/x86/hvm/hypercall.c +1 -1
index 7fb3136f0c..c1bd17571e 100644
@@ -110,7 +110,7 @@ int hvm_hypercall(struct cpu_user_regs *regs)
     {
     case 8:
         eax = regs->rax;
-        /* Fallthrough to permission check. */
+        fallthrough;
     case 4:
     case 2:
         if ( currd->arch.monitor.guest_request_userspace_enabled &&
xen/arch/x86/hvm/irq.c +1 -0
index 210cebb0e6..1eab44defc 100644
@@ -282,6 +282,7 @@ static void hvm_set_callback_irq_level(struct vcpu *v)
             __hvm_pci_intx_assert(d, pdev, pintx);
         else
             __hvm_pci_intx_deassert(d, pdev, pintx);
+        break;
     default:
         break;
     }
xen/arch/x86/hvm/pmtimer.c +1 -0
index 97099ac305..87a7a01c9f 100644
@@ -185,6 +185,7 @@ static int cf_check handle_evt_io(
                 gdprintk(XENLOG_WARNING, 
                          "Bad ACPI PM register write: %x bytes (%x) at %x\n", 
                          bytes, *val, port);
+                break;
             }
         }
         /* Fix up the SCI state to match the new register state */
xen/arch/x86/hvm/svm/svm.c +2 -0
index 988250dbc1..92bb10c504 100644
@@ -681,6 +681,7 @@ static void cf_check svm_get_segment_register(
         ASSERT_UNREACHABLE();
         domain_crash(v->domain);
         *reg = (struct segment_register){};
+        break;
     }
 }
 
@@ -2416,6 +2417,7 @@ static void cf_check svm_set_reg(struct vcpu *v, unsigned int reg, uint64_t val)
         printk(XENLOG_G_ERR "%s(%pv, 0x%08x, 0x%016"PRIx64") Bad register\n",
                __func__, v, reg, val);
         domain_crash(d);
+        break;
     }
 }
 
xen/arch/x86/hvm/vlapic.c +1 -0
index 9cfc82666a..2ec9594271 100644
@@ -367,6 +367,7 @@ static void vlapic_accept_irq(struct vcpu *v, uint32_t icr_low)
         gdprintk(XENLOG_ERR, "TODO: unsupported delivery mode in ICR %x\n",
                  icr_low);
         domain_crash(v->domain);
+        break;
     }
 }
 
xen/arch/x86/hvm/vmx/vmcs.c +2 -0
index 9b6dc51f36..9c5a22dafd 100644
@@ -1446,6 +1446,7 @@ struct vmx_msr_entry *vmx_find_msr(const struct vcpu *v, uint32_t msr,
 
     default:
         ASSERT_UNREACHABLE();
+        return NULL;
     }
 
     if ( !start )
@@ -1598,6 +1599,7 @@ int vmx_del_msr(struct vcpu *v, uint32_t msr, enum vmx_msr_list_type type)
 
     default:
         ASSERT_UNREACHABLE();
+        return -EINVAL;
     }
 
     if ( !start )
xen/arch/x86/hvm/vmx/vmx.c +2 -1
index f16faa6a61..46911c3e1c 100644
@@ -2745,6 +2745,7 @@ static void cf_check vmx_set_reg(struct vcpu *v, unsigned int reg, uint64_t val)
         printk(XENLOG_G_ERR "%s(%pv, 0x%08x, 0x%016"PRIx64") Bad register\n",
                __func__, v, reg, val);
         domain_crash(d);
+        break;
     }
     vmx_vmcs_exit(v);
 }
@@ -3393,7 +3394,7 @@ static int cf_check vmx_msr_read_intercept(
         *msr_content |= MSR_IA32_MISC_ENABLE_BTS_UNAVAIL |
                        MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL;
         /* Perhaps vpmu will change some bits. */
-        /* FALLTHROUGH */
+        fallthrough;
     case MSR_P6_PERFCTR(0)...MSR_P6_PERFCTR(7):
     case MSR_P6_EVNTSEL(0)...MSR_P6_EVNTSEL(3):
     case MSR_CORE_PERF_FIXED_CTR0...MSR_CORE_PERF_FIXED_CTR2:
xen/arch/x86/hvm/vmx/vvmx.c +1 -0
index 39290c9861..c05e0e9326 100644
@@ -2768,6 +2768,7 @@ int nvmx_n2_vmexit_handler(struct cpu_user_regs *regs,
         gprintk(XENLOG_ERR, "Unhandled nested vmexit: reason %u\n",
                 exit_reason);
         domain_crash(v->domain);
+        break;
     }
 
     return ( nvcpu->nv_vmexit_pending == 1 );
xen/arch/x86/hvm/vpic.c +1 -0
index 7c3b5c7254..6427b08086 100644
@@ -309,6 +309,7 @@ static void vpic_ioport_write(
             if ( !(vpic->init_state & 8) )
                 break; /* CASCADE mode: wait for write to ICW3. */
             /* SNGL mode: fall through (no ICW3). */
+            fallthrough;
         case 2:
             /* ICW3 */
             vpic->init_state++;
xen/arch/x86/hvm/vpt.c +1 -2
index e1d6845a28..5e7b9a9f66 100644
@@ -119,8 +119,7 @@ static int pt_irq_masked(struct periodic_time *pt)
 
         gsi = hvm_isa_irq_to_gsi(pt->irq);
     }
-
-    /* Fallthrough to check if the interrupt is masked on the IO APIC. */
+        fallthrough;
     case PTSRC_ioapic:
     {
         int mask = vioapic_get_mask(v->domain, gsi);
Signature · 1 line
2.34.1
#14 lore raw

Re: [XEN PATCH v4 7/9] x86/hvm: address violations of MISRA C Rule 16.3

Quoted 8 lines · Federico Serafini

MISRA C Rule 16.3 states that "An unconditional `break' statement shall terminate every switch-clause".

Add pseudo keyword fallthrough or missing break statement to address violations of the rule.

As a defensive measure, return an error message or a null pointer in case an unreachable return statement is reached.

The two kinds of changes are pretty different in nature. I think that ...

Quoted 9 lines

---
Changes in v4:
- do not separate different parts of HVM:

    a) squash patches 8, 11 and 12 of v3 into this patch;
    b) address also violations of SVM and VMX;

- re-arrange fallthrough positioning to comply with Coverity. Changes in v3:
- squashed here modifications of pmtimer.c;

... while the prior splitting by file was indeed unnecessary (when the main patch's title started with "x86/hvm:"), splitting by measure taken would be quite helpful. Anything purely mechanical can perhaps stay together, but everything more involved may want splitting off.

xen/arch/x86/hvm/emulate.c static int _hvm_emulate_one(struct hvm_emulate_ctxt *hvmemul_ctxt, · line 2677

Quoted 6 lines
xen/arch/x86/hvm/emulate.c +1 -0
@@ -2674,6 +2673,7 @@ static int _hvm_emulate_one(struct hvm_emulate_ctxt *hvmemul_ctxt,
 
     default:
         ASSERT_UNREACHABLE();
+        break;
     }

For example, I'm unconvinced that merely adding "break" is going to be enough here. Imo at least rc also needs updating, to signal an error to the caller (which may be what in the description "error message" is intended to mean). Perhaps the right thing to do here is even to add "return X86EMUL_*;" instead. Question then is which particular return value to use. I would have suggested X86EMUL_UNHANDLEABLE, yet its comment says "No state modified." Then again that may be stale anyway, so perhaps that's the best we can do here.

xen/arch/x86/hvm/vmx/vmcs.c struct vmx_msr_entry *vmx_find_msr(const struct vcpu *v, uint32_t msr, · line 1452

Quoted 10 lines
xen/arch/x86/hvm/vmx/vmcs.c +1 -0
@@ -1446,6 +1446,7 @@ struct vmx_msr_entry *vmx_find_msr(const struct vcpu *v, uint32_t msr,
 
     default:
         ASSERT_UNREACHABLE();
+        return NULL;
     }
 
     if ( !start )

Right below here there is

        return NULL;

Therefore adding "break" instead may be slightly better.

xen/arch/x86/hvm/vmx/vmcs.c int vmx_del_msr(struct vcpu *v, uint32_t msr, enum vmx_msr_list_type type) · line 1605

Quoted 8 lines
xen/arch/x86/hvm/vmx/vmcs.c +1 -0
@@ -1598,6 +1599,7 @@ int vmx_del_msr(struct vcpu *v, uint32_t msr, enum vmx_msr_list_type type)
 
     default:
         ASSERT_UNREACHABLE();
+        return -EINVAL;
     }
 
     if ( !start )

Whereas here I agree that we don't want to pass back -ESRCH in such a case.

Jan

#15 lore raw

PATCH v4 8/9 x86/mm: add defensive return

In reply to Federico Serafini

Add defensive return statement at the end of an unreachable default case. Other than improve safety, this meets the requirements to deviate a violation of MISRA C Rule 16.3: "An unconditional `break' statement shall terminate every switch-clause".

---
No changes from v3, further feedback on this thread would be appreciated:
https://lists.xenproject.org/archives/html/xen-devel/2024-07/msg00474.html

---
 xen/arch/x86/mm.c | 1 +
 1 file changed, 1 insertion(+)
xen/arch/x86/mm.c +1 -0
index 648d6dd475..a1e28b3360 100644
@@ -916,6 +916,7 @@ get_page_from_l1e(
                 return 0;
             default:
                 ASSERT_UNREACHABLE();
+                return -EPERM;
             }
         }
         else if ( l1f & _PAGE_RW )
Signature · 1 line
2.34.1
Reviewed-by on v4 8/9
#16 lore raw

Re: [XEN PATCH v4 8/9] x86/mm: add defensive return

Quoted 6 lines · Federico Serafini

Add defensive return statement at the end of an unreachable default case. Other than improve safety, this meets the requirements to deviate a violation of MISRA C Rule 16.3: "An unconditional `break' statement shall terminate every switch-clause".

Quoted 23 lines

---
No changes from v3, further feedback on this thread would be appreciated:
https://lists.xenproject.org/archives/html/xen-devel/2024-07/msg00474.html

---
 xen/arch/x86/mm.c | 1 +
 1 file changed, 1 insertion(+)
xen/arch/x86/mm.c +1 -0
index 648d6dd475..a1e28b3360 100644
@@ -916,6 +916,7 @@ get_page_from_l1e(
                 return 0;
             default:
                 ASSERT_UNREACHABLE();
+                return -EPERM;
             }
         }
         else if ( l1f & _PAGE_RW )
Signature · 1 line
2.34.1
#17 lore raw

PATCH v4 9/9 x86/mpparse: address a violation of MISRA C Rule 16.3

In reply to Federico Serafini

Add a missing break statement to address a violation of MISRA C Rule 16.3: "An unconditional `break' statement shall terminate every switch-clause".

No functional change.

---
 xen/arch/x86/mpparse.c | 1 +
 1 file changed, 1 insertion(+)
xen/arch/x86/mpparse.c +1 -0
index d8ccab2449..306d8ed97a 100644
@@ -544,6 +544,7 @@ static inline void __init construct_default_ISA_mptable(int mpc_default_type)
 		case 4:
 		case 7:
 			memcpy(bus.mpc_bustype, "MCA   ", 6);
+			break;
 	}
 	MP_bus_info(&bus);
 	if (mpc_default_type > 4) {
Signature · 1 line
2.34.1
#18 lore raw
In reply to Federico Serafini
Quoted 13 lines · Federico Serafini

This patch series fixes a missing escape in a deviation and addresses some violations.

Federico Serafini (9):
automation/eclair: fix deviation of MISRA C Rule 16.3 x86/cpuid: use fallthrough pseudo keyword x86/domctl: address a violation of MISRA C Rule 16.3 x86/vpmu: address violations of MISRA C Rule 16.3 x86/traps: address violations of MISRA C Rule 16.3 x86/mce: address violations of MISRA C Rule 16.3 x86/hvm: address violations of MISRA C Rule 16.3 x86/mm: add defensive return
x86/mpparse: address a violation of MISRA C Rule 16.3

And what exactly was this resend about? Even sent as reply to the original submission, rather than as a plain new thread, thus resulting in everything being mixed up into a single thread?

Jan

#19 lore raw
Quoted 15 lines · Jan Beulich
Quoted 13 lines · Federico Serafini

This patch series fixes a missing escape in a deviation and addresses some violations.

Federico Serafini (9):
automation/eclair: fix deviation of MISRA C Rule 16.3 x86/cpuid: use fallthrough pseudo keyword x86/domctl: address a violation of MISRA C Rule 16.3 x86/vpmu: address violations of MISRA C Rule 16.3 x86/traps: address violations of MISRA C Rule 16.3 x86/mce: address violations of MISRA C Rule 16.3 x86/hvm: address violations of MISRA C Rule 16.3 x86/mm: add defensive return
x86/mpparse: address a violation of MISRA C Rule 16.3

Quoted 3 lines

And what exactly was this resend about? Even sent as reply to the original submission, rather than as a plain new thread, thus resulting in everything being mixed up into a single thread?

I'm sorry I forgot to add the maintainers in the first patch series, so I resent it.

Signature · 3 lines
Federico Serafini, M.Sc.

Software Engineer, BUGSENG (http://bugseng.com)