From patchwork Sun Aug 29 10:22:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Yan X-Patchwork-Id: 12463865 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5CB95C432BE for ; Sun, 29 Aug 2021 10:26:08 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 2851760E73 for ; Sun, 29 Aug 2021 10:26:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 2851760E73 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=O5kEIfVYlV5xFa3XW1Bo8Fd0bQ+08ZX3b0ZsP00fcDQ=; b=iDzQIlemBq2JPw 48eMT4uS6JUA/EfdFf6VHEaIVB40J36UebsBHutvUet8EKVJHYRG1eSzXgU0EabHqml0+n2Ne8WZn xj05h9Yw6U0FX+qgLrPokscQIAGSfJGqvlGU3t9ASXGgvCZvHFgxg3CrMF6t2y2YYt0Frm1s5R8Cm nnVA8oaoW0f2O9PIFmm+F+ZysWclOu9DTCH+eyvEZTg7a9lsJNb0Q3MOtr4fA/ZJGvv//hrxboEyo RuEdaQV8VXgP0J0cbgmsCIBSKvzRo5R160ju1ULEvtIS8kp3eOWgYGdVqfHyoWTflpDp1tDaB5C5I cymu5TEYNeOevazP2n/Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mKHyP-00FNGN-H9; Sun, 29 Aug 2021 10:23:33 +0000 Received: from mail-pf1-x429.google.com ([2607:f8b0:4864:20::429]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mKHxv-00FNEj-TC for linux-arm-kernel@lists.infradead.org; Sun, 29 Aug 2021 10:23:05 +0000 Received: by mail-pf1-x429.google.com with SMTP id 2so9751946pfo.8 for ; Sun, 29 Aug 2021 03:23:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+tIlR3yAnihc/8N68dAkVCR/HC1yo91sWJBQN/lr8bM=; b=EpBQc1jEbWZQDKA/Hd96/dSblduNlrZBfncFOQFXZpBZasUh1zyFsHwfMwKgYRKn2h q4NE7GP+NXGct8xScaCRIZnWy+hcmxCEq/nCYqgCQNL6rwF/YRU1M6f1fD4O4cbNoTzz uXwFsacODV17YlAKMBclA++GTdimgD4pqTRn5Q4GCyKHe6AgjXLUHb8GqfqPlIGscUaX ZgDzHZA0qamkZz1/SgpKYCbiJR76MPDn6r/4PVd/QIasX3mNJggJd6mDMt0CtC5TAb4i KmmVTatyoe7/Mi9gAG1PbwKdoNzQK3A0UihvZVjffBNZQkyZ5IEgzccZ6tRbr9QFbn7X 5f6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+tIlR3yAnihc/8N68dAkVCR/HC1yo91sWJBQN/lr8bM=; b=f3La5CfRFTmxmmvgnnI5MbSQqlWoJUciBxSH20k3woc+JbxW+ItAiexgQVPxLVvma8 /JQsvAsZdaLUx2P0vrNetljwZrHW7VZ5XbV5slEPf+m9pkhy+63XsNBXdLK6LherU5kb nXDW/8XcRIJPn40C5y0lNeJKi8wUquDY8QjGFZ6p66Ur/blLED6bWqGTu7eeTs0uWsoG iEOjOioto/9X1fVAac/zPH31WkUpiokj6lm4OjvzTqBf7H+GJn3MEham/XB8Pyk0obH1 rtVQ/VdU+dk3Q8ChJaUeYGbwPw1auboW9f6vPnC8zgFaYSqNSqV6eVbwgHiT8PdIyMyi WeQg== X-Gm-Message-State: AOAM530PIm0TyFALT4+ZuJGANqMICvZmCvvZqOyVMRorpfSuKJm/A99B UjBQlThjgHluX1grfW56NAstXQ== X-Google-Smtp-Source: ABdhPJx0z9GdJsy4ggFkGrduZsKKGG/vfDnVoFB9KZKLY9yy2wtvbqbnc5phggOaYFxXoxCi8NiAQQ== X-Received: by 2002:a62:8603:0:b029:3c8:3fdb:4aea with SMTP id x3-20020a6286030000b02903c83fdb4aeamr17882261pfd.6.1630232583070; Sun, 29 Aug 2021 03:23:03 -0700 (PDT) Received: from localhost ([134.195.101.46]) by smtp.gmail.com with ESMTPSA id b20sm11404522pfl.9.2021.08.29.03.23.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Aug 2021 03:23:02 -0700 (PDT) From: Leo Yan To: Arnaldo Carvalho de Melo , Adrian Hunter , James Clark , Mathieu Poirier , Suzuki K Poulose , Mike Leach , John Garry , Will Deacon , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Andi Kleen , coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, "Russell King (Oracle)" Cc: Leo Yan Subject: [PATCH v2 2/2] perf auxtrace arm: Support compat_auxtrace_mmap__{read_head|write_tail} Date: Sun, 29 Aug 2021 18:22:38 +0800 Message-Id: <20210829102238.19693-3-leo.yan@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210829102238.19693-1-leo.yan@linaro.org> References: <20210829102238.19693-1-leo.yan@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210829_032303_988226_253AB76A X-CRM114-Status: GOOD ( 15.27 ) 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 When the tool runs with compat mode on Arm platform, the kernel is in 64-bit mode and user space is in 32-bit mode; the user space can use instructions "ldrd" and "strd" for 64-bit value atomicity. This patch adds compat_auxtrace_mmap__{read_head|write_tail} for arm building, it uses "ldrd" and "strd" instructions to ensure accessing atomicity for aux head and tail. The file arch/arm/util/auxtrace.c is built for arm and arm64 building, these two functions are not needed for arm64, so check the compiler macro "__arm__" to only include them for arm building. Signed-off-by: Leo Yan Reviewed-by: James Clark Tested-by: James Clark --- tools/perf/arch/arm/util/auxtrace.c | 32 +++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/tools/perf/arch/arm/util/auxtrace.c b/tools/perf/arch/arm/util/auxtrace.c index b187bddbd01a..c7c7ec0812d5 100644 --- a/tools/perf/arch/arm/util/auxtrace.c +++ b/tools/perf/arch/arm/util/auxtrace.c @@ -107,3 +107,35 @@ struct auxtrace_record *err = 0; return NULL; } + +#if defined(__arm__) +u64 compat_auxtrace_mmap__read_head(struct auxtrace_mmap *mm) +{ + struct perf_event_mmap_page *pc = mm->userpg; + u64 result; + + __asm__ __volatile__( +" ldrd %0, %H0, [%1]" + : "=&r" (result) + : "r" (&pc->aux_head), "Qo" (pc->aux_head) + ); + + return result; +} + +int compat_auxtrace_mmap__write_tail(struct auxtrace_mmap *mm, u64 tail) +{ + struct perf_event_mmap_page *pc = mm->userpg; + + /* Ensure all reads are done before we write the tail out */ + smp_mb(); + + __asm__ __volatile__( +" strd %2, %H2, [%1]" + : "=Qo" (pc->aux_tail) + : "r" (&pc->aux_tail), "r" (tail) + ); + + return 0; +} +#endif