From patchwork Wed Jan 27 22:15:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cong Wang X-Patchwork-Id: 12051135 X-Patchwork-Delegate: bpf@iogearbox.net 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=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 801C0C433E0 for ; Wed, 27 Jan 2021 22:16:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5459664DCC for ; Wed, 27 Jan 2021 22:16:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232375AbhA0WP6 (ORCPT ); Wed, 27 Jan 2021 17:15:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60130 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231153AbhA0WPw (ORCPT ); Wed, 27 Jan 2021 17:15:52 -0500 Received: from mail-oi1-x232.google.com (mail-oi1-x232.google.com [IPv6:2607:f8b0:4864:20::232]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 23E62C061573; Wed, 27 Jan 2021 14:15:12 -0800 (PST) Received: by mail-oi1-x232.google.com with SMTP id d18so3931771oic.3; Wed, 27 Jan 2021 14:15:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Pv2pcU/+/UIa6eojcj2SR6nsmXZahv+O06YIs/Kzafk=; b=lQs4oaiEkF3onn+fDji1VHB0t5ZOhEJld6GYA3N6l6DVUQE5y1YPVZT6CRY9mwIx1N +XzrgNmiqJepvbbwiczkwqhPcsPKqrUsHXaPV61j0eqqTs4GQv5ed8yo6bjUbYWWRWoS Ey9KAZsp9ZML+tjY2ZfyWOyjVY5naE8bWpSYfji9bsrD6XNiIPKfhOtdg2Nupn6ZDau6 5qBpus6DhYuPJqMWRgrP7s16cb44J4Sy+DJ6F7JSwtSjDw3FH2QaRnASL+/dC9YOd7M+ S7kvjfheCbRYXz2GXVgf7XYsKxTBQNak5RohUmkOkGdRZO3yw3kd9UzctiV9AVARhT7M L2Lw== 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:mime-version :content-transfer-encoding; bh=Pv2pcU/+/UIa6eojcj2SR6nsmXZahv+O06YIs/Kzafk=; b=tqTbvn9fmjo+CI7Zy1CMxYCLF/r74ESHfrK4r3SXkyvCeLLbY7n6RRj79KP+wI+/Qg ShA1AwtAK3IgEliOsIWULEwW7RfNaw9/nWFEOX+y9pVQvjZFHJoSaIX/7IzXI8u1NcsY YEVXkupK6/gV5jNmJ/ojD9q8QARUyidCz783k5OLRVBe2Geu+ZjRNsl/mBanVRNsMGK9 7Otvgt+oEn73kDr71iaOpetfKPXpqDr4gOInUBiUF9jFKn+d46puOhObFAk+BuhbUvpu Dhh0BmiXEE7EN7EqwSaZF7ZzSRxByCRpSwicNlg0Kc3lUILU3e2Bxk3kPnecIcIdWunl fL2w== X-Gm-Message-State: AOAM533LaAI+WAe4NT84cMh+M4zs/QUcxBTh5EOaA2mRwR0YGSdRye8O MG9kTaJy8KI2Mgs1y1uMU8Ea+fQ1FDPgaQ== X-Google-Smtp-Source: ABdhPJw9jpL3BiJk1P35bs+zaa3mHhY7lmPeubEjJZ7pUpA0sEmD/ElYDaZTiki8M+1OedbTKBXC3g== X-Received: by 2002:aca:5b46:: with SMTP id p67mr4771520oib.179.1611785711399; Wed, 27 Jan 2021 14:15:11 -0800 (PST) Received: from unknown.attlocal.net ([2600:1700:65a0:ab60:b17d:dead:8ea2:9775]) by smtp.gmail.com with ESMTPSA id w11sm610114otg.58.2021.01.27.14.15.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Jan 2021 14:15:10 -0800 (PST) From: Cong Wang To: netdev@vger.kernel.org Cc: bpf@vger.kernel.org, Cong Wang , John Fastabend , Daniel Borkmann , Jakub Sitnicki , Lorenz Bauer Subject: [Patch bpf-next] skmsg: make sk_psock_destroy() static Date: Wed, 27 Jan 2021 14:15:01 -0800 Message-Id: <20210127221501.46866-1-xiyou.wangcong@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org X-Patchwork-Delegate: bpf@iogearbox.net From: Cong Wang sk_psock_destroy() is a RCU callback, I can't see any reason why it could be used outside. Cc: John Fastabend Cc: Daniel Borkmann Cc: Jakub Sitnicki Cc: Lorenz Bauer Signed-off-by: Cong Wang --- include/linux/skmsg.h | 1 - net/core/skmsg.c | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/include/linux/skmsg.h b/include/linux/skmsg.h index fec0c5ac1c4f..8edbbf5f2f93 100644 --- a/include/linux/skmsg.h +++ b/include/linux/skmsg.h @@ -390,7 +390,6 @@ static inline struct sk_psock *sk_psock_get(struct sock *sk) } void sk_psock_stop(struct sock *sk, struct sk_psock *psock); -void sk_psock_destroy(struct rcu_head *rcu); void sk_psock_drop(struct sock *sk, struct sk_psock *psock); static inline void sk_psock_put(struct sock *sk, struct sk_psock *psock) diff --git a/net/core/skmsg.c b/net/core/skmsg.c index 25cdbb20f3a0..1261512d6807 100644 --- a/net/core/skmsg.c +++ b/net/core/skmsg.c @@ -669,14 +669,13 @@ static void sk_psock_destroy_deferred(struct work_struct *gc) kfree(psock); } -void sk_psock_destroy(struct rcu_head *rcu) +static void sk_psock_destroy(struct rcu_head *rcu) { struct sk_psock *psock = container_of(rcu, struct sk_psock, rcu); INIT_WORK(&psock->gc, sk_psock_destroy_deferred); schedule_work(&psock->gc); } -EXPORT_SYMBOL_GPL(sk_psock_destroy); void sk_psock_drop(struct sock *sk, struct sk_psock *psock) {