Received: by 2002:a5d:9c59:0:0:0:0:0 with SMTP id 25csp1369804iof; Tue, 7 Jun 2022 04:22:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzapQO/A8vXkCSXz7AOL7VjNqJQIcFkFiac+WjxfRMh/SikwtLexRKX8cWIOn00OdPdzgki X-Received: by 2002:a17:902:724a:b0:167:9222:2755 with SMTP id c10-20020a170902724a00b0016792222755mr3486854pll.98.1654600965101; Tue, 07 Jun 2022 04:22:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654600965; cv=none; d=google.com; s=arc-20160816; b=yjEOYx+bSixniBn9jprXnPqMY1LMeRvgmRrQvqdqis1ZhuyxjRiendBNrM3nZm/Qx4 z/0MLrRzqoowMGkle7qn9104QIIPPWV1sbjEmRTATo9pyP+4ybR15eExt0cMQ+T3KwYx 4G2tKJlXxoT/Zho15zjhHb60fQxxOsv+4c6J35KLpzBGeDq5SqIRXtI1O4UdJzEZiStK xaxE9xo24tiqCHtfTO2Ed7GgNXDYiRohs9meM45aBbPMPDbNQuJBY8dlJWzaXVA9ZePp n4LKSzeyPwpGAay12P59cvJs2iBfbW/K0MtMThvCoEl1wowCvX4+ceFDR/O9s2BJdSiw 2QVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=HhsCv6d/FSpe8BIqkOQal1LnRfpT965B/6E9x6d3BJ0=; b=Kmw2oBFYpWRwMWl3/ZYk1EMGIB/IDeRP4n6iEZEL0WU6rV65uMefmop6TOg2jOAy6p ZMdpJatt3LVYMP/Uo8v2usR30U1Ym5ewBYVjLIyv+t0Z9FCfUVWumzNRlSED/RifE2ZB 4Ro70N7hXJES1+hoM+gJZXbfpc1H+t4RNI4By+ndtAd5mejyAlEdjxpMnK/W7hsZWOwc M7tImw+3YFwSLcKvmKGTXOYWUJDmuifv26njbZDbPuJLG8S7ckrHkqZAbOOckskND3kb Xwkq1IH38/CGz0ZfpPwIU9CqxsmZjWYtvhafpr4teepmdOdmORg+7Aaz0E6qcBSJfs0s wBYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=qJx4Abhj; 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=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b15-20020a170903228f00b001640bfcdf58si25371368plh.182.2022.06.07.04.22.30; Tue, 07 Jun 2022 04:22:45 -0700 (PDT) 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=@kernel.org header.s=k20201202 header.b=qJx4Abhj; 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=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231861AbiFFSrm (ORCPT + 99 others); Mon, 6 Jun 2022 14:47:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47408 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231955AbiFFSrl (ORCPT ); Mon, 6 Jun 2022 14:47:41 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0D62FEBEAC; Mon, 6 Jun 2022 11:47:39 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 7ED46B81821; Mon, 6 Jun 2022 18:47:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B90D6C385A9; Mon, 6 Jun 2022 18:47:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1654541257; bh=IsApZ6zYzRY50Wc6SfBfLjWAnjCwNGx9boMJlq2gXIg=; h=From:To:Cc:Subject:Date:From; b=qJx4AbhjIlATpvcSuVodvw9HfRzsKG6H3bj3UK7bnHTHPmhfIJHDGwk0EfacNOI+Q cK2hxwhi+iz/QOLrYuBHw/9MD6PPbuid4JLEt+46jb5LPJNniDmOo8/8Dkk9e9dh0y zciaNUYYt2Pa4S2wwWfPlYu7oXf/2p/DpVqwuFJMgKdlmpOgtkfhv3tU0QFVwU3MW2 HrA9zHnwTq76Cy04KyYl+g+MqPUizQXn6+/sYLKfgHH0BJD0XGy4rrJc8cOjPQqef2 rajRXXhTsBvvaekUuWOyxwXpWjG3Zr1YjddUZH1bKCiZ21xspGQgMXu1EB5QAhO19k AEm7JwzgPeE3g== From: Jiri Olsa To: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko Cc: netdev@vger.kernel.org, bpf@vger.kernel.org, lkml , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Steven Rostedt , Masami Hiramatsu Subject: [PATCHv2 bpf 0/3] bpf: Fix cookie values for kprobe multi Date: Mon, 6 Jun 2022 20:47:28 +0200 Message-Id: <20220606184731.437300-1-jolsa@kernel.org> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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 hi, there's bug in kprobe_multi link that makes cookies misplaced when using symbols to attach. The reason is that we sort symbols by name but not adjacent cookie values. Current test did not find it because bpf_fentry_test* are already sorted by name. v2 changes: - rebased on top of bpf/master - checking if cookies are defined later in swap function [Andrii] - added acks thanks, jirka --- Jiri Olsa (3): selftests/bpf: Shuffle cookies symbols in kprobe multi test ftrace: Keep address offset in ftrace_lookup_symbols bpf: Force cookies array to follow symbols sorting kernel/trace/bpf_trace.c | 60 +++++++++++++++++++++++++++++++++++++++++++++--------------- kernel/trace/ftrace.c | 13 +++++++++++-- tools/testing/selftests/bpf/prog_tests/bpf_cookie.c | 78 +++++++++++++++++++++++++++++++++++++++--------------------------------------- tools/testing/selftests/bpf/progs/kprobe_multi.c | 24 ++++++++++++------------ 4 files changed, 107 insertions(+), 68 deletions(-)