From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 720CEC433EF for ; Thu, 18 Nov 2021 11:26:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 59A6A61A89 for ; Thu, 18 Nov 2021 11:26:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343922AbhKRL3H (ORCPT ); Thu, 18 Nov 2021 06:29:07 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:46329 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343882AbhKRL2N (ORCPT ); Thu, 18 Nov 2021 06:28:13 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637234711; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zzOB74CJjcZMNcmR7SkVFYkvFIHJ/t8Pjrq9GPHfvLc=; b=UIMDaqBFoibn4uEuxonn4hBfaGBAhMhf/JnzdJuDkmxe3AFXiY29jOgLEfVC16AXQAS5cD e75r8Yd7zcD0jJHiBKl5ox2Bt/q72DqGfNkhOqNjSAgzacZaawzxawBCfa3XtiOrcOa1gd uwWThM3rtCjqF73X+phYZBaWzvX+4Xw= Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-298-02c_Vr6MPuWa7iaUtABh1g-1; Thu, 18 Nov 2021 06:25:10 -0500 X-MC-Unique: 02c_Vr6MPuWa7iaUtABh1g-1 Received: by mail-ed1-f70.google.com with SMTP id w18-20020a056402071200b003e61cbafdb4so5000924edx.4 for ; Thu, 18 Nov 2021 03:25:10 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zzOB74CJjcZMNcmR7SkVFYkvFIHJ/t8Pjrq9GPHfvLc=; b=gCnYYsIAgy9v5x1NUPPpjbD7iQdogaym9zzgHd2XJA2QwDK+ZjucJWwXgs7t6ml2Jw PjDQB9DLbFDnqL9R95/fsXRdRJjnHVFKjlyoUjmJ0y4JmHv8BIWMqApQCariJ8j0q6zt iymbYYJF2VR/MT9VsEfSG6PO8yE9TIn1tDHnKBPQDoRxv+1RNGlrlQvfEB7BYAOYRD+E ArqbFEuoG3AfJeSVqxJoMCau2cc1fxCapHinlDpS1fqOOCA/O6oUBVOuliOdwO34gbgf OvEN3d1rtkbvv4XvCMGtlBJ7dhiNEI3v7FXt0VxG0DKmVse0ItQl/BZH8AYme+T8fzJl MzMg== X-Gm-Message-State: AOAM5302yZhrLibJucSeTUnRax1aJ73DF10IwXtyL/Dw7F+IEB/yfF2n L892CwmRhrBwyj46Im1FIS6yrQH60+a4KDrcu0WORKoZ5MRMivUhXcK9nFPXwvFuf7Fpy7yAkcn pHeH9it4CZxPMN8Oe X-Received: by 2002:a17:906:b254:: with SMTP id ce20mr33752020ejb.255.1637234709291; Thu, 18 Nov 2021 03:25:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJyVTHqHxq258/wo2aBL1NVcFRVlFTjKLdyUouotZrmXT5aXHOVSBzQF1U+lUYINEmKsPxwBLg== X-Received: by 2002:a17:906:b254:: with SMTP id ce20mr33751990ejb.255.1637234709146; Thu, 18 Nov 2021 03:25:09 -0800 (PST) Received: from krava.redhat.com (nat-pool-brq-u.redhat.com. [213.175.37.12]) by smtp.gmail.com with ESMTPSA id hr17sm1185249ejc.57.2021.11.18.03.25.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Nov 2021 03:25:08 -0800 (PST) From: Jiri Olsa X-Google-Original-From: Jiri Olsa To: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko Cc: Steven Rostedt , netdev@vger.kernel.org, bpf@vger.kernel.org, Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh Subject: [PATCH bpf-next 02/29] ftrace: Add cleanup to unregister_ftrace_direct_multi Date: Thu, 18 Nov 2021 12:24:28 +0100 Message-Id: <20211118112455.475349-3-jolsa@kernel.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211118112455.475349-1-jolsa@kernel.org> References: <20211118112455.475349-1-jolsa@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Adding ops cleanup to unregister_ftrace_direct_multi, so it can be reused in another register call. Cc: Steven Rostedt Fixes: f64dd4627ec6 ("ftrace: Add multi direct register/unregister interface") Signed-off-by: Jiri Olsa --- kernel/trace/ftrace.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index 7f0594e28226..be5f6b32a012 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -5542,6 +5542,10 @@ int unregister_ftrace_direct_multi(struct ftrace_ops *ops, unsigned long addr) err = unregister_ftrace_function(ops); remove_direct_functions_hash(hash, addr); mutex_unlock(&direct_mutex); + + /* cleanup for possible another register call */ + ops->func = NULL; + ops->trampoline = 0; return err; } EXPORT_SYMBOL_GPL(unregister_ftrace_direct_multi); -- 2.31.1