From patchwork Fri Oct 27 13:33:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaldo Carvalho de Melo X-Patchwork-Id: 158928 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp606901vqb; Fri, 27 Oct 2023 06:34:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHGUh9RGzo09fzrT3KZT/efUHpGJ6rXZYFM9sMVrT+xYCEOvy7MSPk/7spk5jK6Bo6nA7ej X-Received: by 2002:a05:6358:6f1a:b0:168:cdae:a943 with SMTP id r26-20020a0563586f1a00b00168cdaea943mr3749911rwn.2.1698413640842; Fri, 27 Oct 2023 06:34:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698413640; cv=none; d=google.com; s=arc-20160816; b=Ncw9Y7HLojTxOi2cM+uwgafRt+sPwGctJWSA+8LY5PgLuKgXeSg09zv1Q+sHPgXtVN h4NoCEKeNbq4ptNWiLN+utyjNUfZo81osMMY9/j3GhBbEGo6eeqrAH1I0yuPVGM9v86F 8rbIS3SBsmjULUBMlv4Zc2nXHTUzTYi0GVRnGzOXe9ZRyHnLn7u2phQmDFyet2Mm6Eai YhD6fX8/B6KIGAJhrWRiolH3yc2kpdRgpRTmK1yv8OqMue+xyUzIRm/JxzJ6qqwb+GCG gb20OfyxytvFGN9+v7Gp40AgOvMeyvVR5DIxP1XTqILg1MOkMQhhzIvF5UkgJmfmJlti UsGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=1u/V2uj/wPWoCXH+i176NKnKEUXVwEgHo4Q9WSV6WGk=; fh=Fu1iuRNV2fkmrcX6/JMl3tKfQrLb7IrSUlCkANTOK4o=; b=e1dKUdoNr11kRX456kqW2Ml7Pqvg4J+xNe5jYNKItQGaowUfY14l6/d4VG/OGWQkiH VZcpP1DxTXwWfkyKhe5++D2bmWZP+bC9+ni4CLSEKvixjwhRjFE0g0h3CRdb18kGrzl2 AJEXlpSO0ogZ+jcKA+F8Pm/ltASPfKr3svKVx3UK27lf86UMnC0p8eCsm+Ymyb3dKrru 2nT/e8asYO/vaVGBM2Tsf6ZtxF6nksWID/WKmDI2dGFCetBlKjLuQoq/5ioaw3XMxwci dpzir79G+jSwZSuTUERa/723w1JqwOJn9+zUUmOJDY2btB1s8QHqG9VauboAGWLYqri4 2DoA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=pW6FLLzr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id q1-20020a056214194100b0066ad6036429si824598qvk.554.2023.10.27.06.34.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Oct 2023 06:34:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=pW6FLLzr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 33A9A8313363; Fri, 27 Oct 2023 06:33:59 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345916AbjJ0Ndm (ORCPT + 25 others); Fri, 27 Oct 2023 09:33:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59920 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231302AbjJ0Ndj (ORCPT ); Fri, 27 Oct 2023 09:33:39 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CACF1D6 for ; Fri, 27 Oct 2023 06:33:37 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 338ADC433C7; Fri, 27 Oct 2023 13:33:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1698413617; bh=mkOAnvc/y5wxjD9fXidKsxRBk6fewzPGPXWV4xJ0YoE=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=pW6FLLzrRuFXBKlkMAVKVRP6B3RxZ8In9jAfCOPWFr16tWZbGQDWD5Epqb9vU1f4Y J87uvzRTKxM3lkIyNhQGUO2THqxsHkPcssnPkp3e7o3AyJVJ2TbHWefrOWK/b3F0qv DbKWsp4QxJR+UXPysGYq7sFiA9c2BTLbOolNUiiJ2cFPUL4CCHbhwZ6v8zBkUP++qn rVSkwhC9QKh3S+LX0qhdWwu8KfBOIj6jEEJ+AZb1kmEfyNg2crak8yMkvM4IfQlfir AsaJRzNVJbJJ+7ZJdGXZkiVCC8AMlkhlZv5/M9ZJI1seHR9UPAH3Yf3F5Hag9Q0Uy1 SX+2gKi4C++EQ== Received: by quaco.ghostprotocols.net (Postfix, from userid 1000) id 8BCBE4035D; Fri, 27 Oct 2023 10:33:30 -0300 (-03) Date: Fri, 27 Oct 2023 10:33:30 -0300 From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Yang Jihong , Adrian Hunter , Ian Rogers , Jiri Olsa , Linux Kernel Mailing List , linux-perf-users@vger.kernel.org Subject: [PATCH 1/1] perf python: Fix binding linkage due to rename and move of evsel__increase_rlimit() Message-ID: References: <20231023033144.1011896-1-yangjihong1@huawei.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Fri, 27 Oct 2023 06:33:59 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780915782178571493 X-GMAIL-MSGID: 1780915782178571493 The changes in ("perf evsel: Rename evsel__increase_rlimit to rlimit__increase_nofile") ended up breaking the python binding that now references the rlimit__increase_nofile function, add the util/rlimit.o to the tools/perf/util/python-ext-sources to cure that. This was detected by the 'perf test python' regression test: $ perf test python 14: 'import perf' in python : FAILED! $ perf test -v python Couldn't bump rlimit(MEMLOCK), failures may take place when creating BPF maps, etc 14: 'import perf' in python : --- start --- test child forked, pid 2912462 python usage test: "echo "import sys ; sys.path.insert(0, '/tmp/build/perf-tools-next/python'); import perf" | '/usr/bin/python3' " Traceback (most recent call last): File "", line 1, in ImportError: /tmp/build/perf-tools-next/python/perf.cpython-311-x86_64-linux-gnu.so: undefined symbol: rlimit__increase_nofile test child finished with -1 ---- end ---- 'import perf' in python: FAILED! $ Fixes: e093a222d7cba1eb ("perf evsel: Rename evsel__increase_rlimit to rlimit__increase_nofile") Acked-by: Namhyung Kim Acked-by: Yang Jihong Cc: Adrian Hunter Cc: Ian Rogers Cc: Jiri Olsa Link: https://lore.kernel.org/lkml/ZTrCS5Z3PZAmfPdV@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/python-ext-sources | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/perf/util/python-ext-sources b/tools/perf/util/python-ext-sources index 26e1c8d973ea0b95..593b660ec75e24e1 100644 --- a/tools/perf/util/python-ext-sources +++ b/tools/perf/util/python-ext-sources @@ -40,6 +40,7 @@ util/rwsem.c util/hashmap.c util/perf_regs.c util/fncache.c +util/rlimit.c util/perf-regs-arch/perf_regs_aarch64.c util/perf-regs-arch/perf_regs_arm.c util/perf-regs-arch/perf_regs_csky.c