Skip to content

Commit 3893b12

Browse files
Marc ZyngierAlex Shi
authored andcommitted
arm64: KVM: debug: Remove spurious inline attributes
The debug trapping code is pretty heavy on the "inline" attribute, but most functions are actually referenced in the sysreg tables, making the inlining imposible. Removing the useless inline qualifier seems the right thing to do, having verified that the output code is similar. Cc: Alex Bennée <alex.bennee@linaro.org> Acked-by: Christoffer Dall <christoffer.dall@linaro.org> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> (cherry picked from commit 281243cbe075d27ab884858d6e0b15d8ed61bc25) Signed-off-by: Alex Shi <alex.shi@linaro.org>
1 parent bbe9945 commit 3893b12

1 file changed

Lines changed: 29 additions & 29 deletions

File tree

arch/arm64/kvm/sys_regs.c

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -220,9 +220,9 @@ static bool trap_debug_regs(struct kvm_vcpu *vcpu,
220220
* All writes will set the KVM_ARM64_DEBUG_DIRTY flag to ensure the
221221
* hyp.S code switches between host and guest values in future.
222222
*/
223-
static inline void reg_to_dbg(struct kvm_vcpu *vcpu,
224-
struct sys_reg_params *p,
225-
u64 *dbg_reg)
223+
static void reg_to_dbg(struct kvm_vcpu *vcpu,
224+
struct sys_reg_params *p,
225+
u64 *dbg_reg)
226226
{
227227
u64 val = p->regval;
228228

@@ -235,18 +235,18 @@ static inline void reg_to_dbg(struct kvm_vcpu *vcpu,
235235
vcpu->arch.debug_flags |= KVM_ARM64_DEBUG_DIRTY;
236236
}
237237

238-
static inline void dbg_to_reg(struct kvm_vcpu *vcpu,
239-
struct sys_reg_params *p,
240-
u64 *dbg_reg)
238+
static void dbg_to_reg(struct kvm_vcpu *vcpu,
239+
struct sys_reg_params *p,
240+
u64 *dbg_reg)
241241
{
242242
p->regval = *dbg_reg;
243243
if (p->is_32bit)
244244
p->regval &= 0xffffffffUL;
245245
}
246246

247-
static inline bool trap_bvr(struct kvm_vcpu *vcpu,
248-
struct sys_reg_params *p,
249-
const struct sys_reg_desc *rd)
247+
static bool trap_bvr(struct kvm_vcpu *vcpu,
248+
struct sys_reg_params *p,
249+
const struct sys_reg_desc *rd)
250250
{
251251
u64 *dbg_reg = &vcpu->arch.vcpu_debug_state.dbg_bvr[rd->reg];
252252

@@ -280,15 +280,15 @@ static int get_bvr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *rd,
280280
return 0;
281281
}
282282

283-
static inline void reset_bvr(struct kvm_vcpu *vcpu,
284-
const struct sys_reg_desc *rd)
283+
static void reset_bvr(struct kvm_vcpu *vcpu,
284+
const struct sys_reg_desc *rd)
285285
{
286286
vcpu->arch.vcpu_debug_state.dbg_bvr[rd->reg] = rd->val;
287287
}
288288

289-
static inline bool trap_bcr(struct kvm_vcpu *vcpu,
290-
struct sys_reg_params *p,
291-
const struct sys_reg_desc *rd)
289+
static bool trap_bcr(struct kvm_vcpu *vcpu,
290+
struct sys_reg_params *p,
291+
const struct sys_reg_desc *rd)
292292
{
293293
u64 *dbg_reg = &vcpu->arch.vcpu_debug_state.dbg_bcr[rd->reg];
294294

@@ -323,15 +323,15 @@ static int get_bcr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *rd,
323323
return 0;
324324
}
325325

326-
static inline void reset_bcr(struct kvm_vcpu *vcpu,
327-
const struct sys_reg_desc *rd)
326+
static void reset_bcr(struct kvm_vcpu *vcpu,
327+
const struct sys_reg_desc *rd)
328328
{
329329
vcpu->arch.vcpu_debug_state.dbg_bcr[rd->reg] = rd->val;
330330
}
331331

332-
static inline bool trap_wvr(struct kvm_vcpu *vcpu,
333-
struct sys_reg_params *p,
334-
const struct sys_reg_desc *rd)
332+
static bool trap_wvr(struct kvm_vcpu *vcpu,
333+
struct sys_reg_params *p,
334+
const struct sys_reg_desc *rd)
335335
{
336336
u64 *dbg_reg = &vcpu->arch.vcpu_debug_state.dbg_wvr[rd->reg];
337337

@@ -366,15 +366,15 @@ static int get_wvr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *rd,
366366
return 0;
367367
}
368368

369-
static inline void reset_wvr(struct kvm_vcpu *vcpu,
370-
const struct sys_reg_desc *rd)
369+
static void reset_wvr(struct kvm_vcpu *vcpu,
370+
const struct sys_reg_desc *rd)
371371
{
372372
vcpu->arch.vcpu_debug_state.dbg_wvr[rd->reg] = rd->val;
373373
}
374374

375-
static inline bool trap_wcr(struct kvm_vcpu *vcpu,
376-
struct sys_reg_params *p,
377-
const struct sys_reg_desc *rd)
375+
static bool trap_wcr(struct kvm_vcpu *vcpu,
376+
struct sys_reg_params *p,
377+
const struct sys_reg_desc *rd)
378378
{
379379
u64 *dbg_reg = &vcpu->arch.vcpu_debug_state.dbg_wcr[rd->reg];
380380

@@ -408,8 +408,8 @@ static int get_wcr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *rd,
408408
return 0;
409409
}
410410

411-
static inline void reset_wcr(struct kvm_vcpu *vcpu,
412-
const struct sys_reg_desc *rd)
411+
static void reset_wcr(struct kvm_vcpu *vcpu,
412+
const struct sys_reg_desc *rd)
413413
{
414414
vcpu->arch.vcpu_debug_state.dbg_wcr[rd->reg] = rd->val;
415415
}
@@ -723,9 +723,9 @@ static bool trap_debug32(struct kvm_vcpu *vcpu,
723723
* system is in.
724724
*/
725725

726-
static inline bool trap_xvr(struct kvm_vcpu *vcpu,
727-
struct sys_reg_params *p,
728-
const struct sys_reg_desc *rd)
726+
static bool trap_xvr(struct kvm_vcpu *vcpu,
727+
struct sys_reg_params *p,
728+
const struct sys_reg_desc *rd)
729729
{
730730
u64 *dbg_reg = &vcpu->arch.vcpu_debug_state.dbg_bvr[rd->reg];
731731

0 commit comments

Comments
 (0)