From patchwork Tue Sep 12 06:08:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randy Dunlap X-Patchwork-Id: 138573 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp825939vqx; Tue, 12 Sep 2023 20:19:27 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEFFFzXy+0KVdp7zi37XXukzyEKx6Cik9xyUMUCcAOs2cINrkPDhobB9QFNpPdBrOHhhuTI X-Received: by 2002:a05:6a21:33a7:b0:148:1826:f834 with SMTP id yy39-20020a056a2133a700b001481826f834mr1398230pzb.54.1694575166863; Tue, 12 Sep 2023 20:19:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694575166; cv=none; d=google.com; s=arc-20160816; b=IM2JBr1UK4Dh7+KbCee/KdsqEC8j5N8HHtbwnNY3G8/PsjAhMQjBmtNbptNYqz7TU7 3gOHfY+/RMwxVr5mNhiC8PtI1lbJrJWC9+g+BOyiPU8fPzZzcvHFlS827VwPKy5AYwqh 6ATqujX47CADgm4EuVmDhjplVUeIYTIOqDxzAuz5hEjQkP4UkKMwXmCK0cMy2FQjzuG/ OtniGXRcC+gCeimxgULMgwfTPh8sm/dOHXzqHpWQKmIDRfNpel98fO9d9fY+oiPfjmV0 OdHfiaXeVBKR9KmgMILibg6nhuEPWyMMK34AQLQoSnUSTI7EHN4gTbZlMyXRSByUnvu8 evww== 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=sFuiyOstyY2vXIAcLnV3dqg2ACy5vJ9mQ7xD1vWkyWU=; fh=yd2OWi+fzorMa6ZpQaSZgC6MRgMRAUCKsBqMYtLkdBU=; b=Ugw4TNsQKi5nEZ/uQzK2S/RsOZoYXHOQanyCy+WjxLyR875gUBIyoORzkrX+DAGRvi +oXiN/6aLT8Uqlc/bzGSsu/w/huaBDvl3oL7l4/5e8rGcoxwxdAEaaKPkBOhfS+LhuAc YQ/rF6A/y2/KkFFOYmyqCFIusa906QXRDUn80o+VcGKnEFlI+OOxOI5ByGwInyrraWzD 5pLHGx7N9nyulX+5QYQhYEJWgnLlZffQeFHnIIB3pSFRnT5S0ByOArlby8wcUdizBeCN uFWAXoKGcfpVlDdsAgoCqDn5A93dfr07LHR7sO91rh0iMLJVTUFeAONc0/XGnBu2VFYH mopw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=S+ghahK5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id gt2-20020a17090af2c200b0026841a42bffsi640307pjb.139.2023.09.12.20.19.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 20:19:26 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=S+ghahK5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id E1C2C802586F; Mon, 11 Sep 2023 23:08:34 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229450AbjILGIT (ORCPT + 39 others); Tue, 12 Sep 2023 02:08:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55746 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229445AbjILGIR (ORCPT ); Tue, 12 Sep 2023 02:08:17 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1B9C0E77; Mon, 11 Sep 2023 23:08:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:In-Reply-To:References; bh=sFuiyOstyY2vXIAcLnV3dqg2ACy5vJ9mQ7xD1vWkyWU=; b=S+ghahK5zgWOWbOTGcZSByqN4k zlUfkuCICe0Zo95hD5owu+bcaqeo2x7YtelwLOYT+BvXaavKIrSo9avGUI9fGd2n1BG7I3uF9TiXV XqpqeG+RQXkOsYDYUoj1bdd6cnfD+CcR4Pnbnl6aW+8KiG6Yz6qvlMuvGxaalRwPE1p1sM9K/i1FO akZ3V3QRBtD7H9lndzkSNoROC6jRSDAWl/I3JIATZxLkcWKfwsnYqc657U2TfY2K52NzLPlfiAqvS Rnmfu1KDyWkf5xv4Di1a5V4TAUN1JKE7BTscWhIB1Pe9ZY/cp97GWrMc5cuxveOxvlYvopZmMryo5 ogbMDsVw==; Received: from [2601:1c2:980:9ec0::9fed] (helo=bombadil.infradead.org) by bombadil.infradead.org with esmtpsa (Exim 4.96 #2 (Red Hat Linux)) id 1qfwZJ-002FfO-15; Tue, 12 Sep 2023 06:08:13 +0000 From: Randy Dunlap To: linux-kernel@vger.kernel.org Cc: Randy Dunlap , Martin KaFai Lau , bpf@vger.kernel.org, Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko Subject: [PATCH bpf] bpf, cgroup: fix multiple kernel-doc warnings Date: Mon, 11 Sep 2023 23:08:12 -0700 Message-ID: <20230912060812.1715-1-rdunlap@infradead.org> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 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 (howler.vger.email [0.0.0.0]); Mon, 11 Sep 2023 23:08:35 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776865271652524678 X-GMAIL-MSGID: 1776890849968695110 Fix missing or extra function parameter kernel-doc warnings in cgroup.c: kernel/bpf/cgroup.c:1359: warning: Excess function parameter 'type' description in '__cgroup_bpf_run_filter_skb' kernel/bpf/cgroup.c:1359: warning: Function parameter or member 'atype' not described in '__cgroup_bpf_run_filter_skb' kernel/bpf/cgroup.c:1439: warning: Excess function parameter 'type' description in '__cgroup_bpf_run_filter_sk' kernel/bpf/cgroup.c:1439: warning: Function parameter or member 'atype' not described in '__cgroup_bpf_run_filter_sk' kernel/bpf/cgroup.c:1467: warning: Excess function parameter 'type' description in '__cgroup_bpf_run_filter_sock_addr' kernel/bpf/cgroup.c:1467: warning: Function parameter or member 'atype' not described in '__cgroup_bpf_run_filter_sock_addr' kernel/bpf/cgroup.c:1512: warning: Excess function parameter 'type' description in '__cgroup_bpf_run_filter_sock_ops' kernel/bpf/cgroup.c:1512: warning: Function parameter or member 'atype' not described in '__cgroup_bpf_run_filter_sock_ops' kernel/bpf/cgroup.c:1685: warning: Excess function parameter 'type' description in '__cgroup_bpf_run_filter_sysctl' kernel/bpf/cgroup.c:1685: warning: Function parameter or member 'atype' not described in '__cgroup_bpf_run_filter_sysctl' kernel/bpf/cgroup.c:795: warning: Excess function parameter 'type' description in '__cgroup_bpf_replace' kernel/bpf/cgroup.c:795: warning: Function parameter or member 'new_prog' not described in '__cgroup_bpf_replace' Signed-off-by: Randy Dunlap Cc: Martin KaFai Lau Cc: bpf@vger.kernel.org Cc: Alexei Starovoitov Cc: Daniel Borkmann Cc: Andrii Nakryiko --- kernel/bpf/cgroup.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff -- a/kernel/bpf/cgroup.c b/kernel/bpf/cgroup.c --- a/kernel/bpf/cgroup.c +++ b/kernel/bpf/cgroup.c @@ -785,7 +785,8 @@ found: * to descendants * @cgrp: The cgroup which descendants to traverse * @link: A link for which to replace BPF program - * @type: Type of attach operation + * @new_prog: &struct bpf_prog for the target BPF program with its refcnt + * incremented * * Must be called with cgroup_mutex held. */ @@ -1334,7 +1335,7 @@ int cgroup_bpf_prog_query(const union bp * __cgroup_bpf_run_filter_skb() - Run a program for packet filtering * @sk: The socket sending or receiving traffic * @skb: The skb that is being sent or received - * @type: The type of program to be executed + * @atype: The type of program to be executed * * If no socket is passed, or the socket is not of type INET or INET6, * this function does nothing and returns 0. @@ -1424,7 +1425,7 @@ EXPORT_SYMBOL(__cgroup_bpf_run_filter_sk /** * __cgroup_bpf_run_filter_sk() - Run a program on a sock * @sk: sock structure to manipulate - * @type: The type of program to be executed + * @atype: The type of program to be executed * * socket is passed is expected to be of type INET or INET6. * @@ -1449,7 +1450,7 @@ EXPORT_SYMBOL(__cgroup_bpf_run_filter_sk * provided by user sockaddr * @sk: sock struct that will use sockaddr * @uaddr: sockaddr struct provided by user - * @type: The type of program to be executed + * @atype: The type of program to be executed * @t_ctx: Pointer to attach type specific context * @flags: Pointer to u32 which contains higher bits of BPF program * return value (OR'ed together). @@ -1496,7 +1497,7 @@ EXPORT_SYMBOL(__cgroup_bpf_run_filter_so * @sock_ops: bpf_sock_ops_kern struct to pass to program. Contains * sk with connection information (IP addresses, etc.) May not contain * cgroup info if it is a req sock. - * @type: The type of program to be executed + * @atype: The type of program to be executed * * socket passed is expected to be of type INET or INET6. * @@ -1670,7 +1671,7 @@ const struct bpf_verifier_ops cg_dev_ver * @ppos: value-result argument: value is position at which read from or write * to sysctl is happening, result is new position if program overrode it, * initial value otherwise - * @type: type of program to be executed + * @atype: type of program to be executed * * Program is run when sysctl is being accessed, either read or written, and * can allow or deny such access.