Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp540960pxb; Thu, 5 Nov 2020 06:49:56 -0800 (PST) X-Google-Smtp-Source: ABdhPJzWcfau41nRAlar0FX3e24ulEmYo0T/VTvoW5lLErKttTO7hr5mbQ1DjTB+qXu0QEqdTo85 X-Received: by 2002:a17:906:1804:: with SMTP id v4mr2662410eje.201.1604587796241; Thu, 05 Nov 2020 06:49:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1604587796; cv=none; d=google.com; s=arc-20160816; b=yeK/Ai29sUpEZkF/DqtZ9vx1gvPvCx7mw7cCpMpFmthc3ifNwUE4afrAQg98sXjEEU jM/7THQ6idzkaAweHnnuJhfk96TLmdzDraLbWhMsxklreZ/jU67z/ShTmclRbG/BnL4Y r9/pvj9aqKUGlLNsg9IUgkN6EhHqgY0HHnKtLe/8dZH4vFx9URrcyPlp59GQkfyo93OJ bkZ60WEUL0fBje3FAb3TLH+tdsH/HzquLkFx3iCEpYm1/3QieWyp22ZSLOSumE31MQU1 huoKJy+shcHlRrWD3xswTckJ67EmLofLUJS2hLZuJaXI113Pb3uXqrrflI7MxAZD2+ya mn1A== 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=dO+JlXlnkrnBDZXYdaSU/QyOlrQwphJnoU4gOQSY0iI=; b=FHWeDKoS666wnBogQk0MuhoXczvDJszzEs3AUzmyoGdQ+91Xxg4MzPdDmnoHcL1kXF Ugxr+QUc+ocYjI55sp79TzTNchswuV9O7igQg12I4oFm0YQ4Os6Pe4IUwVhidhrS+D99 2l/FefaIfv66USOwD6W2N98QWVw5EO+0Bw0bfwZLtS9trgjiyoxMBYb8sC9HBbu/DqbS 0aV1BWk7ejRUfJ00igF9aHkuVQeMFd6KJeEij/MMqQp7sM3uVn7zGqjLY+8Wd+vc4wqC c4zf9VoGjVLCkmQbu/BvxqU38R/9QN5kyBsecULnh653lZGmu2Q7SNGwUwLsg+BnsogG h7dQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=Z3mu7WHs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a4si1180230ejc.628.2020.11.05.06.49.32; Thu, 05 Nov 2020 06:49:56 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=Z3mu7WHs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731085AbgKEOsD (ORCPT + 99 others); Thu, 5 Nov 2020 09:48:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47410 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730979AbgKEOsA (ORCPT ); Thu, 5 Nov 2020 09:48:00 -0500 Received: from mail-ej1-x642.google.com (mail-ej1-x642.google.com [IPv6:2a00:1450:4864:20::642]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 998C7C0613D2 for ; Thu, 5 Nov 2020 06:47:59 -0800 (PST) Received: by mail-ej1-x642.google.com with SMTP id 7so3040331ejm.0 for ; Thu, 05 Nov 2020 06:47:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=dO+JlXlnkrnBDZXYdaSU/QyOlrQwphJnoU4gOQSY0iI=; b=Z3mu7WHsTm8xDIs0TbK+N/FmKgu8ELMCdpB9N6m8YdFcBphzZfHbjkJLJXIImEsVh7 rWvKFI6/H4ttEdZhNTVql/VPoJBha1ro4NVuwMwZYugIh39+b6lhtlfmq4PkfbcDZaKe aZUnLcCKExZN/KnhmIGZaVAdU1HWyMHIsgsbM= 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=dO+JlXlnkrnBDZXYdaSU/QyOlrQwphJnoU4gOQSY0iI=; b=aE36tglMT2KdLT9dB6xubeeyXWWtoFXQr99Tgmc9A6LvDuy8qSVGE5djnRSK4TZ/re BCnaxPCn+pGQRNU8KKXwi0j+9wpuYE3JuTLjEwPPtL0K276uLyHwIG+oumsrqmxDMs3t mZACg9xXeCjNLPgye02mzCdN1w+FKSlrMOQdVYFmq3iaxMQ0lSJmI8hVud5yrrsJpnH1 TvkTCuw581OsQ2b3HonpUnz8RY6X1kMrTe6UHFcldU1UK/k2ubyNjPCqR665bAvBx+QY nzQqK95aGk+4WiqcfB4Fl907Jukc300yOXpNZSt2ZKY6SYgLLWvaXgxEZBJhQyjilOIr hyMg== X-Gm-Message-State: AOAM5306syTu0wBmKNHaRi7QTyRB6mW8FPix9BsRv0R0eE7nFLHtHuqt kbIrmIwfYFa0Ds8oX0SrvQDjdMJIByF+Fb/P X-Received: by 2002:a17:906:d285:: with SMTP id ay5mr2590782ejb.84.1604587677900; Thu, 05 Nov 2020 06:47:57 -0800 (PST) Received: from kpsingh.zrh.corp.google.com ([81.6.44.51]) by smtp.gmail.com with ESMTPSA id z13sm1075870ejp.30.2020.11.05.06.47.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Nov 2020 06:47:57 -0800 (PST) From: KP Singh To: linux-kernel@vger.kernel.org, bpf@vger.kernel.org Cc: Alexei Starovoitov , Daniel Borkmann , Martin KaFai Lau , Song Liu , Paul Turner , Jann Horn , Hao Luo Subject: [PATCH bpf-next v4 0/9] Implement task_local_storage Date: Thu, 5 Nov 2020 15:47:46 +0100 Message-Id: <20201105144755.214341-1-kpsingh@chromium.org> X-Mailer: git-send-email 2.29.1.341.ge80a0c044ae-goog MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: KP Singh # v3 -> v4 - Move the patch that exposes spin lock helpers to LSM programs as the first patch as some of the changes in the implementation are actually for spin locks. - Clarify the comment in the bpf_task_storage_{get, delete} helper as discussed with Martin. - Added Martin's ack and rebased. # v2 -> v3 - Added bpf_spin_locks to the selftests for local storage, found that these are not available for LSM programs. - Made spin lock helpers available for LSM programs (except sleepable programs which need more work). - Minor fixes for includes and added short commit messages for patches that were split up for libbpf and bpftool. - Added Song's acks. # v1 -> v2 - Updated the refcounting for task_struct and simplified conversion of fd -> struct pid. - Some fixes suggested by Martin and Andrii, notably: * long return type for the bpf_task_storage_delete helper (update for bpf_inode_storage_delete will be sent separately). * Remove extra nullness check to task_storage_ptr in map syscall ops. * Changed the argument signature of the BPF helpers to use task_struct pointer in uapi headers. * Remove unnecessary verifier logic for the bpf_get_current_task_btf helper. * Split the changes for bpftool and libbpf. - Exercised syscall operations for local storage (kept a simpler verison in test_local_storage.c, the eventual goal will be to update sk_storage_map.c for all local storage types). - Formatting fixes + Rebase. We already have socket and inode local storage since [1] This patch series: * Implements bpf_local_storage for task_struct. * Implements the bpf_get_current_task_btf helper which returns a BTF pointer to the current task. Not only is this generally cleaner (reading from the task_struct currently requires BPF_CORE_READ), it also allows the BTF pointer to be used in task_local_storage helpers. * In order to implement this helper, a RET_PTR_TO_BTF_ID is introduced which works similar to RET_PTR_TO_BTF_ID_OR_NULL but does not require a nullness check. * Implements a detection in selftests which uses the task local storage to deny a running executable from unlinking itself. [1]: https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git/commit/?id=f836a56e84ffc9f1a1cd73f77e10404ca46a4616 KP Singh (9): bpf: Allow LSM programs to use bpf spin locks bpf: Implement task local storage libbpf: Add support for task local storage bpftool: Add support for task local storage bpf: Implement get_current_task_btf and RET_PTR_TO_BTF_ID bpf: Fix tests for local_storage bpf: Update selftests for local_storage to use vmlinux.h bpf: Add tests for task_local_storage bpf: Exercise syscall operations for inode and sk storage include/linux/bpf.h | 1 + include/linux/bpf_lsm.h | 23 ++ include/linux/bpf_types.h | 1 + include/uapi/linux/bpf.h | 48 +++ kernel/bpf/Makefile | 1 + kernel/bpf/bpf_lsm.c | 8 + kernel/bpf/bpf_task_storage.c | 315 ++++++++++++++++++ kernel/bpf/syscall.c | 3 +- kernel/bpf/verifier.c | 37 +- kernel/trace/bpf_trace.c | 16 + security/bpf/hooks.c | 2 + .../bpf/bpftool/Documentation/bpftool-map.rst | 3 +- tools/bpf/bpftool/bash-completion/bpftool | 2 +- tools/bpf/bpftool/map.c | 4 +- tools/include/uapi/linux/bpf.h | 48 +++ tools/lib/bpf/libbpf_probes.c | 1 + .../bpf/prog_tests/test_local_storage.c | 182 +++++++++- .../selftests/bpf/progs/local_storage.c | 103 ++++-- 18 files changed, 741 insertions(+), 57 deletions(-) create mode 100644 kernel/bpf/bpf_task_storage.c -- 2.29.1.341.ge80a0c044ae-goog