From patchwork Thu Sep 19 19:07:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colton Lewis X-Patchwork-Id: 13807965 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8ADCACF3964 for ; Thu, 19 Sep 2024 19:14:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type:Cc:To:From: Subject:Message-ID:References:Mime-Version:In-Reply-To:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=os3Yqql37R8r3BEesV69Cp0Wu//D+lGOxICBFWLJF5s=; b=BK8SEUjstKUzpxMW7QMRtee89r ui8mdYC+85+MPs8FrwBfKjD4TwcM8VlTJ+P+/8xgpu9tHBl1PKBhWKleMF0+xAuhIeo+CazG0MXMt QHcPk075v3wzEltajbKdIC9mCtKlNYnxg2c4BlZAIFDB8UD8Thgyc8JR97MebE0X9nLt8ef+aSBow ylfO9XwT9YpBoDNMX/wepv+Er6PkV55lobTeWeLs5bWeIPB+rO4O9qHirrEQ/DVh7J9b7TkfWqs5H 5DH5u+Uz8MGSYZFhOp5riThg6iB82p5i3QvjuMWnpfigiKVWk0vG7U21KjzlBcvtkrd7nrtLUxthL kJayUA2w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1srMbQ-0000000AtiZ-0p9l; Thu, 19 Sep 2024 19:14:08 +0000 Received: from mail-yb1-xb4a.google.com ([2607:f8b0:4864:20::b4a]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1srMVe-0000000Asjx-1hEz for linux-arm-kernel@lists.infradead.org; Thu, 19 Sep 2024 19:08:11 +0000 Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-e1a74f824f9so2276267276.1 for ; Thu, 19 Sep 2024 12:08:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1726772888; x=1727377688; darn=lists.infradead.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=os3Yqql37R8r3BEesV69Cp0Wu//D+lGOxICBFWLJF5s=; b=XfXhTVFTwmfd0jdclMazYj3OZk9S1YmnU3ltLnqW4hQTB1gFdkiS3WlJTRIVuqXJVU LnrJ6JDHXBopqF0oh4+Ho+pUFjZ/mGoqNSYeLubxB1D7fasidSEChkdosGeHEEYBvvKa qpY4GD1ihH/VQANRbg1Zrdi852LU08lx8u44wsxUt/kNPxub94WzfbzyL52ZxNR/RElb 3ib3r7Fd6p63qUOfW36nuR9UDjk1GgdVvQK4tAi2BoXa0GKR0hx7jCcGSNM2KTdH7+oh bLPIaNnC7KabjD9TYoEiqWuiRJYwCbOPdGb3HJ0Y0DzeJb6BQK6ZhqLLNmCBwcw4Sag1 Lg2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726772888; x=1727377688; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=os3Yqql37R8r3BEesV69Cp0Wu//D+lGOxICBFWLJF5s=; b=jr+bvCcMmgPAWaRKRWQtl3GpJVzVMT69s1bIrpM6kzSBqArrAWrofm5HlrWIIyxEer /hw4KFi+la975j66qFOcKc8RWcTcDgm/om3gP1EhjBTVP0QzZay7Wv7waiC3RG46f8eq V0lG/SZw6VmiXKUM+QkP+53zNQSWfZY0yH6dYPBecykpTshrmMkguVpuEh4Y9l2Qsw18 /h9BhqcEf0LlLcUSTChheRRdKq7KJ4Sw9vPkFxT8SGGAl1eHrMQ6xqNZMUC4kgZ6DGT1 ZQwkzLJ8JC/oGcCOiNgmRnwbNLeVCZ7kFdaR7u4q1vbqw0XyjlsJjRk+ES0BEBkbfMmT 7z5w== X-Forwarded-Encrypted: i=1; AJvYcCV4sYoVpP2eo9GD97rO3Y1hZAggOneG6Soph/bOQm5cRhViGU6Pjcx5DyxVt5esKFkAvOEnL16E+1rlYcbZ4D8r@lists.infradead.org X-Gm-Message-State: AOJu0Yx+dDpnpmlTBnhrBB+aBqH26H2wjLiQmjz1gYoIABqWlDTHuovO QTmIPF0thbPpyD1+TE3D5UExd7BPHTXSfROS9xpuGGpZ9OUm+Ll7rbAjkWvJ19PItrjdDcUxRPD lP6nHJgd1Ume8ZGu/+gFHVw== X-Google-Smtp-Source: AGHT+IEWKocKtUeJyLcIg/Q0/lFfDEFCwNKFuqL4bh0kqfDWnkDMObP8hKFL4orR1R805yrNr96S1GsShGwKfOHrhQ== X-Received: from coltonlewis-kvm.c.googlers.com ([fda3:e722:ac3:cc00:11b:3898:ac11:fa18]) (user=coltonlewis job=sendgmr) by 2002:a25:b20e:0:b0:e20:298c:541 with SMTP id 3f1490d57ef6-e2250cd4633mr337276.9.1726772888086; Thu, 19 Sep 2024 12:08:08 -0700 (PDT) Date: Thu, 19 Sep 2024 19:07:49 +0000 In-Reply-To: <20240919190750.4163977-1-coltonlewis@google.com> Mime-Version: 1.0 References: <20240919190750.4163977-1-coltonlewis@google.com> X-Mailer: git-send-email 2.46.0.792.g87dc391469-goog Message-ID: <20240919190750.4163977-5-coltonlewis@google.com> Subject: [PATCH v4 4/5] x86: perf: Refactor misc flag assignments From: Colton Lewis To: kvm@vger.kernel.org Cc: Oliver Upton , Sean Christopherson , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Will Deacon , Russell King , Catalin Marinas , Michael Ellerman , Nicholas Piggin , Christophe Leroy , Naveen N Rao , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Thomas Gleixner , Borislav Petkov , Dave Hansen , x86@kernel.org, "H . Peter Anvin" , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, Colton Lewis X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240919_120810_551654_F83505CE X-CRM114-Status: GOOD ( 16.05 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Break the assignment logic for misc flags into their own respective functions to reduce the complexity of the nested logic. Signed-off-by: Colton Lewis --- arch/x86/events/core.c | 31 +++++++++++++++++++++++-------- arch/x86/include/asm/perf_event.h | 2 ++ 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/arch/x86/events/core.c b/arch/x86/events/core.c index 760ad067527c..d51e5d24802b 100644 --- a/arch/x86/events/core.c +++ b/arch/x86/events/core.c @@ -2948,16 +2948,34 @@ unsigned long perf_arch_instruction_pointer(struct pt_regs *regs) return regs->ip + code_segment_base(regs); } +static unsigned long common_misc_flags(struct pt_regs *regs) +{ + if (regs->flags & PERF_EFLAGS_EXACT) + return PERF_RECORD_MISC_EXACT_IP; + + return 0; +} + +unsigned long perf_arch_guest_misc_flags(struct pt_regs *regs) +{ + unsigned long guest_state = perf_guest_state(); + unsigned long flags = common_misc_flags(regs); + + if (guest_state & PERF_GUEST_USER) + flags |= PERF_RECORD_MISC_GUEST_USER; + else if (guest_state & PERF_GUEST_ACTIVE) + flags |= PERF_RECORD_MISC_GUEST_KERNEL; + + return flags; +} + unsigned long perf_arch_misc_flags(struct pt_regs *regs) { unsigned int guest_state = perf_guest_state(); - int misc = 0; + unsigned long misc = common_misc_flags(regs); if (guest_state) { - if (guest_state & PERF_GUEST_USER) - misc |= PERF_RECORD_MISC_GUEST_USER; - else - misc |= PERF_RECORD_MISC_GUEST_KERNEL; + misc |= perf_arch_guest_misc_flags(regs); } else { if (user_mode(regs)) misc |= PERF_RECORD_MISC_USER; @@ -2965,9 +2983,6 @@ unsigned long perf_arch_misc_flags(struct pt_regs *regs) misc |= PERF_RECORD_MISC_KERNEL; } - if (regs->flags & PERF_EFLAGS_EXACT) - misc |= PERF_RECORD_MISC_EXACT_IP; - return misc; } diff --git a/arch/x86/include/asm/perf_event.h b/arch/x86/include/asm/perf_event.h index feb87bf3d2e9..d95f902acc52 100644 --- a/arch/x86/include/asm/perf_event.h +++ b/arch/x86/include/asm/perf_event.h @@ -538,7 +538,9 @@ struct x86_perf_regs { extern unsigned long perf_arch_instruction_pointer(struct pt_regs *regs); extern unsigned long perf_arch_misc_flags(struct pt_regs *regs); +extern unsigned long perf_arch_guest_misc_flags(struct pt_regs *regs); #define perf_arch_misc_flags(regs) perf_arch_misc_flags(regs) +#define perf_arch_guest_misc_flags(regs) perf_arch_guest_misc_flags(regs) #include