From patchwork Thu Jan 7 04:17:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Song Liu X-Patchwork-Id: 12002841 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=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham 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 4C5FEC433E0 for ; Thu, 7 Jan 2021 04:23:50 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id E41BF23118 for ; Thu, 7 Jan 2021 04:23:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E41BF23118 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=fb.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 105AB8D0121; Wed, 6 Jan 2021 23:23:49 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 08C6A8D011F; Wed, 6 Jan 2021 23:23:49 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E95DD8D0121; Wed, 6 Jan 2021 23:23:48 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0029.hostedemail.com [216.40.44.29]) by kanga.kvack.org (Postfix) with ESMTP id CFF298D011F for ; Wed, 6 Jan 2021 23:23:48 -0500 (EST) Received: from smtpin23.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 8C90C824556B for ; Thu, 7 Jan 2021 04:23:48 +0000 (UTC) X-FDA: 77677685736.23.owner30_0302d62274e7 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin23.hostedemail.com (Postfix) with ESMTP id 6845D37606 for ; Thu, 7 Jan 2021 04:23:48 +0000 (UTC) X-HE-Tag: owner30_0302d62274e7 X-Filterd-Recvd-Size: 3985 Received: from mx0b-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by imf41.hostedemail.com (Postfix) with ESMTP for ; Thu, 7 Jan 2021 04:23:47 +0000 (UTC) Received: from pps.filterd (m0148460.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 1074NlxM003143 for ; Wed, 6 Jan 2021 20:23:47 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=facebook; bh=dJgDLXEMTzBTa8wEw2hWn8DvWFj4bRLDxAu+JSHfbn4=; b=oO8yiUb4AiOsbQAna5wY9hF0CrVHqMC/GDDKPt0SDGCI6ZQdZK+bemAJVhWSawnNKCMO URJz87BDKH3IB0/06ImQ+q+RmNJie/nFHMPfYjgGApbEIpRJgUc887WXFT0w3hI1THhG 6r979jRg14vMcldwNy1cmW0yWv19WfcpG64= Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com with ESMTP id 35wr0x8pfr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 06 Jan 2021 20:23:47 -0800 Received: from intmgw001.08.frc2.facebook.com (2620:10d:c085:108::8) by mail.thefacebook.com (2620:10d:c085:21d::4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Wed, 6 Jan 2021 20:23:38 -0800 Received: by devbig006.ftw2.facebook.com (Postfix, from userid 4523) id 4FBD362E0620; Wed, 6 Jan 2021 20:18:17 -0800 (PST) From: Song Liu To: , , CC: , , , , , , , Song Liu , Yonghong Song Subject: [PATCH v3 bpf-next 2/4] bpf: allow bpf_d_path in sleepable bpf_iter program Date: Wed, 6 Jan 2021 20:17:59 -0800 Message-ID: <20210107041801.2003241-3-songliubraving@fb.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20210107041801.2003241-1-songliubraving@fb.com> References: <20210107041801.2003241-1-songliubraving@fb.com> MIME-Version: 1.0 X-FB-Internal: Safe X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.343,18.0.737 definitions=2021-01-07_02:2021-01-06,2021-01-07 signatures=0 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 priorityscore=1501 impostorscore=0 bulkscore=0 malwarescore=0 suspectscore=0 clxscore=1015 spamscore=0 lowpriorityscore=0 mlxlogscore=671 adultscore=0 mlxscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2101070024 X-FB-Internal: deliver X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: task_file and task_vma iter programs have access to file->f_path. Enable bpf_d_path to print paths of these file. bpf_iter programs are generally called in sleepable context. However, it is still necessary to diffientiate sleepable and non-sleepable bpf_iter programs: sleepable programs have access to bpf_d_path; non-sleepable programs have access to bpf_spin_lock. Acked-by: Yonghong Song Signed-off-by: Song Liu Acked-by: KP Singh --- kernel/trace/bpf_trace.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c index ebadaa83502c1..fb60127b0806e 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -1191,6 +1191,11 @@ BTF_SET_END(btf_allowlist_d_path) static bool bpf_d_path_allowed(const struct bpf_prog *prog) { + if (prog->type == BPF_PROG_TYPE_TRACING && + prog->expected_attach_type == BPF_TRACE_ITER && + prog->aux->sleepable) + return true; + if (prog->type == BPF_PROG_TYPE_LSM) return bpf_lsm_is_sleepable_hook(prog->aux->attach_btf_id);