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=-3.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 9AD2BC433DF for ; Sun, 7 Jun 2020 20:52:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6E64E2078B for ; Sun, 7 Jun 2020 20:52:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=cloudflare.com header.i=@cloudflare.com header.b="J1MUpiUq" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727779AbgFGUwe (ORCPT ); Sun, 7 Jun 2020 16:52:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46630 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726823AbgFGUwe (ORCPT ); Sun, 7 Jun 2020 16:52:34 -0400 Received: from mail-ed1-x544.google.com (mail-ed1-x544.google.com [IPv6:2a00:1450:4864:20::544]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A46A8C08C5C4 for ; Sun, 7 Jun 2020 13:52:32 -0700 (PDT) Received: by mail-ed1-x544.google.com with SMTP id q13so11764265edi.3 for ; Sun, 07 Jun 2020 13:52:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloudflare.com; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=1G07w47LS2GVvWUAMlEyfb7I8BzMHJf84EiK66bALbQ=; b=J1MUpiUqYS+rrSFVW5LZGZpGL6fHw2RfH4phpJD/E4yehFBT7rmPgS5HkviEdJ0Sfk 04Dk6/QX5sF26qs0zckwfK41r6sG8y707X1erkXzD8g5Hq8C78yw4zNZLSMqH9BwtBu0 ZvjmWzRChrNW53ZOrUzD36PI7OAlA3uHHZ8kw= 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=1G07w47LS2GVvWUAMlEyfb7I8BzMHJf84EiK66bALbQ=; b=PovusflkQCIgxTEJFAoGaVjtzSyLf80kFkhmjnSV/6DhJBaPHDhyr0oVbeZFq6Ggaz 3KpDTH7Y60qaqeUUnYaJWKucf6o4xKUMMjHQrskyo2kBPZHzPDtnwMlX95cOkP6K9wfb 4DXFDIwHTR41jC8jkjGP/VbrukcaDystDNFzPu+TJ92hS4L6caFPadjSpVM5ZCMQn/7u CXrNSdFWNT01TvzIBXp7AD1rQb7xVRLvasLFxSJsyUkaXRyyLOS4lzQtym/IHTpyFYOE yvZGJ5LZoBVVPo64/Iny7JEfdUzRaVA1i4wFqcCrROgfvgUK+++9vk1/ztGSfF3T8T2s YtnA== X-Gm-Message-State: AOAM531/DuIuSXRmq9oalN0/C+JvP84vULG74gOcPmNDHQpNjfHaZVNc dZXllCNAKNVrDutB5GoOqmvPeHH4mgM= X-Google-Smtp-Source: ABdhPJzxDb97vWcWqEd/4PXkAxGxWDt+GyQa76dMfiGJr/gV3QPTaG4SvzNBoSOXmXokgw+S5sEEZQ== X-Received: by 2002:aa7:da46:: with SMTP id w6mr18926329eds.31.1591563151012; Sun, 07 Jun 2020 13:52:31 -0700 (PDT) Received: from cloudflare.com ([2a02:a310:c262:aa00:b35e:8938:2c2a:ba8b]) by smtp.gmail.com with ESMTPSA id h8sm10887095edk.72.2020.06.07.13.52.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Jun 2020 13:52:30 -0700 (PDT) From: Jakub Sitnicki To: bpf@vger.kernel.org Cc: netdev@vger.kernel.org, kernel-team@cloudflare.com, Eric Dumazet , John Fastabend Subject: [PATCH bpf 0/2] Fixes for sock_hash_free Date: Sun, 7 Jun 2020 22:52:27 +0200 Message-Id: <20200607205229.2389672-1-jakub@cloudflare.com> X-Mailer: git-send-email 2.25.4 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 series is an attempt to fix a race in sock_hash_free recently reported by Eric [0]. The race, and a mem leak I found on the way, can be triggered by the crude reproducer posted below. [0] https://lore.kernel.org/bpf/6f8bb6d8-bb70-4533-f15b-310db595d334@gmail.com/ Cc: Eric Dumazet Cc: John Fastabend --8<-- enum { NUM_SOCKS = 1000 }; static void *close_map(void *map) { close(*(int *)map); return NULL; } int main(void) { int sock[NUM_SOCKS]; pthread_t worker; int map; int i, err; map = bpf_create_map(BPF_MAP_TYPE_SOCKHASH, sizeof(int), sizeof(int), NUM_SOCKS, 0); if (map < 0) error(1, -map, "map create"); for (i = 0; i < NUM_SOCKS; i++) { int fd = socket(AF_INET, SOCK_STREAM, 0); if (fd < 0) error(1, errno, "socket"); err = listen(fd, SOMAXCONN); if (err) error(1, errno, "listen"); sock[i] = fd; err = bpf_map_update_elem(map, &i, &fd, BPF_ANY); if (err) error(1, errno, "map update"); } err = pthread_create(&worker, NULL, close_map, &map); if (err) error(1, err, "thread create"); /* usleep(100); */ for (int i = 0; i < NUM_SOCKS; i++) close(sock[i]); pthread_join(worker, NULL); return 0; } -->8-- Jakub Sitnicki (2): bpf, sockhash: Fix memory leak when unlinking sockets in sock_hash_free bpf, sockhash: Synchronize delete from bucket list on map free net/core/sock_map.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) -- 2.25.4