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 X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 00AC4C35DF2 for ; Tue, 25 Feb 2020 04:46:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C903B24681 for ; Tue, 25 Feb 2020 04:46:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="QslHQOPx" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728952AbgBYEq1 (ORCPT ); Mon, 24 Feb 2020 23:46:27 -0500 Received: from mail-pl1-f193.google.com ([209.85.214.193]:46438 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728725AbgBYEq1 (ORCPT ); Mon, 24 Feb 2020 23:46:27 -0500 Received: by mail-pl1-f193.google.com with SMTP id y8so4958555pll.13; Mon, 24 Feb 2020 20:46:26 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=/tBIPCAZc0laAnqgwSkq+gQyP8rdQEQry0AKY7Daoz0=; b=QslHQOPxgGfys9Mhqsb1XUyfjCkLshsJYP+bYy5CYiEwc7qxYcA3matCW7pPcDNOkT NjabxpXzFcpqP6kc78KWcA+rrWT9g4GvYy0lW6NDfmm+pkEOW8LnbtAkaexCZ9IPr3cN hWgvcdTffwfHuU9Ri/3+JhTpKLxK+MA012JRq78xoZghRKkJ0gTmX7q+yKdYkiLzq4SR qtHAVEfv3aZ9s5QB/EdRLPQkH/sfl4FwWir00menmpV27iKJCD3wnu6uacyWn2SCnBOE 94TYdzjLl2EUIIndBcQ6E/4hhrFhvp7YDrcT8mhyIUI1HSg4HfqVb54rmpZa5NqmClPA ipcw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=/tBIPCAZc0laAnqgwSkq+gQyP8rdQEQry0AKY7Daoz0=; b=LKUdX+hj1eCD0mrXwH9MRcyPhcWiSKvzYWXRSBlvngeK/c2cAfCJscQL7xrZQ3lCsw netL74FF58HG+pjZ1FvW+27v/+GixWIV2IOJ1vkUOISxj8fFpvrFvlA99Z1fWx/lgfux K8hrUGVP6KPCHW0ygbuvUJXspSXi93kN7+EdYjxW2sTe9HCfrBSEQIuWqSv1kusW/Rze Hkh1bejw9YDOPGYcDmV+s3zRM0sunZ2gKuIpCk2iXqsrpsVk1S5iu8vUJRVUDEG6bBmr pL0Uk2zUljA+iksa/qHCSu8cA7IvjV47qnMQeoSeaiByeykIK7L4+inyT9GR2uD7U2P3 y7Dg== X-Gm-Message-State: APjAAAVdqK//r8hsmEgnXinZKyQNrA/mL97lCG4s0lAlr4ZsblBxucE3 1KLMt7OhW/CgJrkk7+SLS90XU8jcjb8= X-Google-Smtp-Source: APXvYqzqdicsBD3ukoT0gBFzvYsWIS6vpaTrPm4S5WYxxUbs6QjXiCYUZmzsE6sc9mZybt0dPUBd9Q== X-Received: by 2002:a17:90a:858c:: with SMTP id m12mr2783214pjn.127.1582605986004; Mon, 24 Feb 2020 20:46:26 -0800 (PST) Received: from kernel.rdqbwbcbjylexclmhxlbqg5jve.hx.internal.cloudapp.net ([65.52.171.215]) by smtp.gmail.com with ESMTPSA id l13sm1170879pjq.23.2020.02.24.20.46.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Feb 2020 20:46:25 -0800 (PST) From: Lingpeng Chen To: bpf Cc: Alexei Starovoitov , Daniel Borkmann , John Fastabend , "David S . Miller" , netdev@vger.kernel.org, Petar Penkov , Song Liu , Lingpeng Chen , Song Liu Subject: [PATCH v4 bpf-next 2/3] bpf: Sync uapi bpf.h to tools/ Date: Tue, 25 Feb 2020 04:45:37 +0000 Message-Id: <20200225044538.61889-3-forrest0579@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200225044538.61889-1-forrest0579@gmail.com> References: <20200225044538.61889-1-forrest0579@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org This patch sync uapi bpf.h to tools/. Signed-off-by: Lingpeng Chen Acked-by: Song Liu --- tools/include/uapi/linux/bpf.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h index 906e9f2752db..c53178f7585e 100644 --- a/tools/include/uapi/linux/bpf.h +++ b/tools/include/uapi/linux/bpf.h @@ -2909,6 +2909,12 @@ union bpf_attr { * of sizeof(struct perf_branch_entry). * * **-ENOENT** if architecture does not support branch records. + * + * u64 bpf_get_netns_id(struct bpf_sock_ops *bpf_socket) + * Description + * Obtain netns id of sock + * Return + * The current netns inum */ #define __BPF_FUNC_MAPPER(FN) \ FN(unspec), \ @@ -3030,7 +3036,8 @@ union bpf_attr { FN(tcp_send_ack), \ FN(send_signal_thread), \ FN(jiffies64), \ - FN(read_branch_records), + FN(read_branch_records), \ + FN(get_netns_id), /* integer value in 'imm' field of BPF_CALL instruction selects which helper * function eBPF program intends to call -- 2.20.1