From patchwork Tue Mar 7 03:21:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 65251 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2222685wrd; Mon, 6 Mar 2023 19:46:43 -0800 (PST) X-Google-Smtp-Source: AK7set81kdf+AwuS+aq1O1VWwMX/qOxE6KF8K/Gv8G4zTLZmpwb9/X+GhUVZq4INuLM3Xu51oe8p X-Received: by 2002:a17:902:b18f:b0:19e:b6b0:697 with SMTP id s15-20020a170902b18f00b0019eb6b00697mr7009655plr.52.1678160802884; Mon, 06 Mar 2023 19:46:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678160802; cv=none; d=google.com; s=arc-20160816; b=erxYXbDgEkQ/C8hCtKMCNo8CxziPbK4QnLOCwW5vzay9/JrpFm6V+MUuBmDx2RSrbw XaYFjziAafkbGSi5f13FXOrOyhkNY5QYsnAWEXUoxlOwJty3tQtEeFJQui1c24/M50sk MPKxbCL6fY4DNbCJHgTn7Ex6KWu+KeVedd7cEZt1RepGahemKG4xSSTiQbNqPdtSMyyD LkAxbacP1fDLTHSWNWhO7W2aSpQdHFpHcq54EmblTOcMhRy1jQODwSMAfYFSDbGO39xV 0K7r4KZpBvwv/ZseTsxLYt2yhyMGBFrIxLrKtbZ4www9rPL+v0CmHuDaAaLXsJtzsV8X c8pQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:to:from:subject:mime-version:message-id:date :dkim-signature; bh=4V7qYWhF33WfuebsbvBQGuVFdWrj0NpdHzfUvHWbnC8=; b=Pn3Zxs2POd1WmbJSOdTmPsqWnHJb0krGz7UqMKXhO4NqLBCINY0t42xPQU6nzRJX2L J5EWsriBRAeycHapOVcLbEXLLP3bDpqCVYu2f38T2CLAkfxOglyfBbgjHH11fGJBzs7i Pm3JddVI4K2maAEA9l9H247EbgwtpbKkqfPGmYgsVJVMMrHloMyc+nAxE2JojI8rLmEq M76Q+a/0J0pwtyuwOxQyAoHxgzlEMZBVKxKLfVvuAuwAg6jyhROj7TnKacFIrVEHhxrV iSqngK/hccVFh8+TakMGn7vXbl8D7qFmySg/sAPt08eQmTGl0SsCh1F5t39qH+hV9MoR 6NgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=T6aJICY3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s11-20020a170902ea0b00b0019909c2569dsi12300602plg.528.2023.03.06.19.46.30; Mon, 06 Mar 2023 19:46:42 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=T6aJICY3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229760AbjCGDVe (ORCPT + 99 others); Mon, 6 Mar 2023 22:21:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41300 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229718AbjCGDVb (ORCPT ); Mon, 6 Mar 2023 22:21:31 -0500 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A8D0A2BEE7 for ; Mon, 6 Mar 2023 19:21:29 -0800 (PST) Received: by mail-yb1-xb49.google.com with SMTP id i11-20020a256d0b000000b0086349255277so12764549ybc.8 for ; Mon, 06 Mar 2023 19:21:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1678159289; h=to:from:subject:mime-version:message-id:date:from:to:cc:subject :date:message-id:reply-to; bh=4V7qYWhF33WfuebsbvBQGuVFdWrj0NpdHzfUvHWbnC8=; b=T6aJICY3NlE5u1vNf9OmUu/eQQfbV1GOJRNrimXa/y/VrCdgNdOV7kGTIj3rJyf4wa aqwHTM01jEscUPE0aEfwaQeY7t7uOeWnYctZUoykgy3b/+ezfZnYP/dibefqCpC8upTn ojKMH5WPYxFHPy+ps/fY/KIMAmJueL/XJO2AVHpeeRyo+9BLATfCDjkoxAhaH38hFolS KB15K1yev8xl8ggZq9RJzJp7l431FszYjyPjR4iCTFLUWp06RhKgWW2QF6ViLTB6UYti 25dfkSOrJjRW17VdryAboCaHdNloYycIqLVfz7XIBhCBHvHHroIen3Y0R0JTpZwvBdJG 1b4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678159289; h=to:from:subject:mime-version:message-id:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=4V7qYWhF33WfuebsbvBQGuVFdWrj0NpdHzfUvHWbnC8=; b=y49iJNxiAOcC/cLhgQAJcooaXOdhOVvM/8ET1LdALQGmI5WmKd74JCHmuXmK19WQ3C tDhibbFbritsPD4lvrixgQAGAucYWMgWf3MU0FfptOiZZJPtMYQxgw1i+nzhF4jBj/dx osiWdGmo+WU2BmWvS9Od1qlS6ZlNJjkdBd8UEgkoT++JzcACT6kfIIevM8CVXrPvIIcB Hu6Nwkm+eZg6d5v8/lYcJEiHELEsQhV6GAyBcPnx2JVBgsDSOOBcawRZfcaSQYCRvdHj j4PIuYge575tyCPK7IFBYYQPZtC/w3WDYIFkYzSR+G9RrQbZIFJkLsxV3Y3vqj6j24hL UCQg== X-Gm-Message-State: AO0yUKXoKOsdr6NJ1DhNlWd3QvxwuxgvtcuZrUxpYZBsh6BBWlU6Hveo lFduHSBFhKy64+MSAkJEigaaP3V7BtHP X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:1c60:6b8e:dccc:a3b1]) (user=irogers job=sendgmr) by 2002:a81:4005:0:b0:532:e887:2c23 with SMTP id l5-20020a814005000000b00532e8872c23mr8552310ywn.9.1678159288922; Mon, 06 Mar 2023 19:21:28 -0800 (PST) Date: Mon, 6 Mar 2023 19:21:17 -0800 Message-Id: <20230307032117.3461008-1-irogers@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.40.0.rc0.216.gc4246ad0f0-goog Subject: [PATCH] perf lock contention: Fix builtin detection From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Martin KaFai Lau , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759679142373135116?= X-GMAIL-MSGID: =?utf-8?q?1759679142373135116?= __has_builtin was passed the macro rather than the actual builtin feature. Fixes: 1bece1351c65 ("perf lock contention: Support old rw_semaphore type") Signed-off-by: Ian Rogers --- tools/perf/util/bpf_skel/lock_contention.bpf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/util/bpf_skel/lock_contention.bpf.c b/tools/perf/util/bpf_skel/lock_contention.bpf.c index e6007eaeda1a..e422eee0f942 100644 --- a/tools/perf/util/bpf_skel/lock_contention.bpf.c +++ b/tools/perf/util/bpf_skel/lock_contention.bpf.c @@ -182,7 +182,7 @@ static inline struct task_struct *get_lock_owner(__u64 lock, __u32 flags) struct mutex *mutex = (void *)lock; owner = BPF_CORE_READ(mutex, owner.counter); } else if (flags == LCB_F_READ || flags == LCB_F_WRITE) { -#if __has_builtin(bpf_core_type_matches) +#if __has_builtin(__builtin_preserve_type_info) if (bpf_core_type_matches(struct rw_semaphore___old)) { struct rw_semaphore___old *rwsem = (void *)lock; owner = (unsigned long)BPF_CORE_READ(rwsem, owner);