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=-11.4 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=no 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 04FF0C31E40 for ; Fri, 9 Aug 2019 16:10:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B3E4D2086A for ; Fri, 9 Aug 2019 16:10:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="RtD6ftuc" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2407415AbfHIQKl (ORCPT ); Fri, 9 Aug 2019 12:10:41 -0400 Received: from mail-qt1-f202.google.com ([209.85.160.202]:48366 "EHLO mail-qt1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405611AbfHIQKl (ORCPT ); Fri, 9 Aug 2019 12:10:41 -0400 Received: by mail-qt1-f202.google.com with SMTP id k13so2032420qtp.15 for ; Fri, 09 Aug 2019 09:10:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=Rlwks2ipCMMHTWuuc/0daFgqcPBRnGzn67xoeH5SLoE=; b=RtD6ftucSKfwfoAs2Otr2GgUw9iABu+CPWRRGb5VIv9vL599BzkmAug4vqNqmM1bBj K/s54iFPUMLV68vtto4ScZ8sgWWo1YQN/VGHCsDMXfM62ZiU0ytc2PUVOVr4Ml9RrNO+ ez+tWs74XFsfZowEErk5OB7f1BG3KOBEwzgLX5vbZgAGSygy5ioK7urbb934Me6YhpEn sJ7m/t4q7uoe936kLYga2Xu+F66CjckiBhfNGeK0JbK9uiya/qaLdld/9KL7XAeIT/Tw hhEDFadiV9p1pXYFesght/Hq08AABMybwL6flNko7mUWRqFROlEXYjL5/0oSpAci2RkO lpEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=Rlwks2ipCMMHTWuuc/0daFgqcPBRnGzn67xoeH5SLoE=; b=PPF0PrPZ5KcVw/cDrCNVFx0t3n0Pfblw2me7czLRc2akBkgLxyk8p7C2EHV3F3YoH+ OoBHV9B0tF3w3h3v0Ro2aHiKC+IT3bqeSLaEwsgHrdfTatsCQb6o3zOe7XVJ+mUJ/22m /9DgxlDZRGwBC2Z7i3T9rrmcWHt50ks4IUxpym4Gm+0bHQsJV545nfZoPDYW0G3u6XBQ 0bOWZyfbnteukqZgF+KZatSMlIvS/NAQYsdjujYjjYLjuS2qKlBNPhIJE8K9nWMn3Jia 2PgWXyXBU5XWbd1MCgKCrx4wSg+6lmztQGqiVXMbxXshyIFv4MDIvW3SUiF9pM6UtuiU WQ7Q== X-Gm-Message-State: APjAAAVpPrQaKRA8yjBt4Y9HVhUwXcufMbBKvOJv4NazlEyfqXeKBekY yB0Vy8LnFvTPBmziuirWdZTmqGxpIqBiOpuC/uDbMM3b3dZ1xjjjJaFeoU7Vf+Maz4Gqa/5p8Zk v9mdYA6kHyE/V6HIIgxaBSC8bltV+FTf9qQ7POuvegmDmpgX8UaXswA== X-Google-Smtp-Source: APXvYqwsTIbT4sbw5O+zmwokwI/h9Upaz9F3JQmrT3/rbVURRPtk+iw+dNegZwJ1erCostY2fPt3VVk= X-Received: by 2002:a05:620a:143b:: with SMTP id k27mr18154715qkj.426.1565367040393; Fri, 09 Aug 2019 09:10:40 -0700 (PDT) Date: Fri, 9 Aug 2019 09:10:34 -0700 Message-Id: <20190809161038.186678-1-sdf@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.23.0.rc1.153.gdeed80330f-goog Subject: [PATCH bpf-next v2 0/4] bpf: support cloning sk storage on accept() From: Stanislav Fomichev To: netdev@vger.kernel.org, bpf@vger.kernel.org Cc: davem@davemloft.net, ast@kernel.org, daniel@iogearbox.net, Stanislav Fomichev , Martin KaFai Lau , Yonghong Song Content-Type: text/plain; charset="UTF-8" Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Currently there is no way to propagate sk storage from the listener socket to a newly accepted one. Consider the following use case: fd = socket(); setsockopt(fd, SOL_IP, IP_TOS,...); /* ^^^ setsockopt BPF program triggers here and saves something * into sk storage of the listener. */ listen(fd, ...); while (client = accept(fd)) { /* At this point all association between listener * socket and newly accepted one is gone. New * socket will not have any sk storage attached. */ } Let's add new BPF_F_CLONE flag that can be specified when creating a socket storage map. This new flag indicates that map contents should be cloned when the socket is cloned. v2: * remove spinlocks around selem_link_map/sk (Martin KaFai Lau) * BPF_F_CLONE on a map, not selem (Martin KaFai Lau) * hold a map while cloning (Martin KaFai Lau) * use BTF maps in selftests (Yonghong Song) * do proper cleanup selftests; don't call close(-1) (Yonghong Song) * export bpf_map_inc_not_zero Cc: Martin KaFai Lau Cc: Yonghong Song Stanislav Fomichev (4): bpf: export bpf_map_inc_not_zero bpf: support cloning sk storage on accept() bpf: sync bpf.h to tools/ selftests/bpf: add sockopt clone/inheritance test include/linux/bpf.h | 2 + include/net/bpf_sk_storage.h | 10 + include/uapi/linux/bpf.h | 3 + kernel/bpf/syscall.c | 16 +- net/core/bpf_sk_storage.c | 100 ++++++- net/core/sock.c | 9 +- tools/include/uapi/linux/bpf.h | 3 + tools/testing/selftests/bpf/.gitignore | 1 + tools/testing/selftests/bpf/Makefile | 3 +- .../selftests/bpf/progs/sockopt_inherit.c | 97 +++++++ .../selftests/bpf/test_sockopt_inherit.c | 253 ++++++++++++++++++ 11 files changed, 487 insertions(+), 10 deletions(-) create mode 100644 tools/testing/selftests/bpf/progs/sockopt_inherit.c create mode 100644 tools/testing/selftests/bpf/test_sockopt_inherit.c -- 2.23.0.rc1.153.gdeed80330f-goog