From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CEB0413AA45 for ; Wed, 11 Sep 2024 22:05:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726092339; cv=none; b=Ql6DfhyYf6gjfEG1zc2p/rMu9xj7OgLs+b35Pbc0ENYW5xjsqp9RA1AZAX6Gd6Xc8RGmToVmkwBDQ+D4chATts2hUxiIoBycFCCNbco/Dh4gheT7buvT0yiz64mncsd+5sWaz+sGJAK9OEg2M4405nOb9W/Caff+0nUbSdaoJDs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726092339; c=relaxed/simple; bh=bUuvrWFSv3BmUrrwJf5eHrL8j4woZvMxGXVhs85lWkk=; h=Date:In-Reply-To:Mime-Version:Message-ID:Subject:From:To:Cc: Content-Type; b=uPUBgcGmb+pnkiQVIr3PrOmdPzqcGu9tMvpcObreXJk/qgiTSiMQys90HspyyLDkHiCfC0QVVs8L2wmJ3kSFJmQa48Ur15zWYEs8SAWbSUjLGG9WWAb9k4dtUEJBwFDCg3ouBL3IFWV0NRn/olJB82VzsxCAPJRTG2mdcm3TAiY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--coltonlewis.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=Hu0hVXWS; arc=none smtp.client-ip=209.85.219.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--coltonlewis.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Hu0hVXWS" Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-e0b8fa94718so907813276.0 for ; Wed, 11 Sep 2024 15:05:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1726092337; x=1726697137; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:in-reply-to:date:from:to :cc:subject:date:message-id:reply-to; bh=uSnPM7Z73BdDwIKjWD3zfTeRtaq8wKDl6kU6LBNgXKw=; b=Hu0hVXWSRNSYV6Z+7qhxnmpnKymV3LpBErD5gWvTSM+VftMZzkGPmGSghCVco5Bq5o JdfLbwjO46vMjsLz8/veyQHxKvN2aBG1M65WRtB6AxtLsQCYcMlEGlx55H6mjln0e7Az gGwOSuoYiJP4zjQjF+tS00FY4vcSuEr4fLUI8DZNwsFdgGBxx0KOr9jliVbm9wUl/zDa 4wvMLf+j/+pyJkSdK7WndmWq2NT9JokbLM2UjXQfQokGMGG2mjafO2AMrLQetXWsVGGh avMPO54x0TaC+Oiw1uh6EmCE8ilJcLx9Vncz7t/xv6XfighNmF/ErqjKUv9VKQwEBYWA D73A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726092337; x=1726697137; h=cc:to:from:subject:message-id:mime-version:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=uSnPM7Z73BdDwIKjWD3zfTeRtaq8wKDl6kU6LBNgXKw=; b=Zod/9SjegUhw3HlhZSHay6kyJ0fzjT7TaPhogoU+GJLdChBnCwQIRdvbZYJh8eM4yR LWAu23mX8hVFqZEmgDyCOqA7XOo1ID1xZMlDPVVDegFPVBReav+Y6Fpl8CGKggCHybAQ LgUa9e+/SaZLAOSwx3rvGplHPIke1+D6H8KYJCF8L1l92XuT55eDmbXmG3x3vb3w+gNJ GrxHbmkmcVEn0Q3bA3AXGCcllPF7Vl95N2sFpHHr5f5bIG4Laof0Isv1b9MbOUiUDYu3 vnobjvcaBPcRaNtIdCi0sF4cVHc2qjmgYuiMMPzVAnAuOE/sMgGYVfEZJicweKdgknBu h9Yg== X-Forwarded-Encrypted: i=1; AJvYcCXyPqESWIufbDoy2M8KPmdfbfi0CeGQkolTLP7Oh5t7zUjkrtNF5zASwWfbuCInyfcIIllJS1h6v30gJA82TfPk@vger.kernel.org X-Gm-Message-State: AOJu0YwJHgKGQZqqRsUicc/Rv84aLvh1KBfBOignj4xhYSUR+X1aPxsx AzzcWj04E+ZID7KoFMVUIvJvuCIdcaKdG9dhm5GrkqfJIf6GpAzkh3inc4wp4wiVN3xrSnOmNSf YuXGHiv13SC2OgJf3UIL7Og== X-Google-Smtp-Source: AGHT+IF9AOcID1tAjXrc0JMac0EDJz+dHtqrQkj3EUSn3vqGuyTbyD2exFl+z4P0Z9sNallPuFjPTF0m9Vi898GeuQ== X-Received: from coltonlewis-kvm.c.googlers.com ([fda3:e722:ac3:cc00:11b:3898:ac11:fa18]) (user=coltonlewis job=sendgmr) by 2002:a25:aa87:0:b0:e0b:fe07:1e22 with SMTP id 3f1490d57ef6-e1d9db996f3mr4706276.1.1726092336807; Wed, 11 Sep 2024 15:05:36 -0700 (PDT) Date: Wed, 11 Sep 2024 22:05:35 +0000 In-Reply-To: (message from Ingo Molnar on Thu, 5 Sep 2024 11:22:20 +0200) Precedence: bulk X-Mailing-List: linux-perf-users@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 Message-ID: Subject: Re: [PATCH 4/5] x86: perf: Refactor misc flag assignments From: Colton Lewis To: Ingo Molnar Cc: kvm@vger.kernel.org, oliver.upton@linux.dev, seanjc@google.com, peterz@infradead.org, mingo@redhat.com, acme@kernel.org, namhyung@kernel.org, mark.rutland@arm.com, alexander.shishkin@linux.intel.com, jolsa@kernel.org, irogers@google.com, adrian.hunter@intel.com, kan.liang@linux.intel.com, will@kernel.org, linux@armlinux.org.uk, catalin.marinas@arm.com, mpe@ellerman.id.au, npiggin@gmail.com, christophe.leroy@csgroup.eu, naveen@kernel.org, hca@linux.ibm.com, gor@linux.ibm.com, agordeev@linux.ibm.com, borntraeger@linux.ibm.com, svens@linux.ibm.com, tglx@linutronix.de, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, 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 Content-Type: text/plain; charset="UTF-8"; format=flowed; delsp=yes Ingo Molnar writes: > * Colton Lewis wrote: >> 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..87457e5d7f65 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(); >> + >> + 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(); > So I'm quite sure this won't even build at this point ... Must have been a wrongly resolved conflict after rebase. I had thought I rebuilt before sending but something slipped. It's fixed > Thanks, > Ingo