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=-4.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS 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 7A82FC4360F for ; Thu, 4 Apr 2019 12:25:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2F0CD206C0 for ; Thu, 4 Apr 2019 12:25:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=cumulusnetworks.com header.i=@cumulusnetworks.com header.b="Uq8E53Hl" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729887AbfDDMY7 (ORCPT ); Thu, 4 Apr 2019 08:24:59 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:50655 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729295AbfDDMY7 (ORCPT ); Thu, 4 Apr 2019 08:24:59 -0400 Received: by mail-wm1-f67.google.com with SMTP id z11so2849898wmi.0 for ; Thu, 04 Apr 2019 05:24:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cumulusnetworks.com; s=google; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=C4Cam7pZYC3sdTlinycpNlQUpaFIVngbSxMs1sJR63U=; b=Uq8E53Hl8U6x8N4djkpfHAiXA76JUnvJHmwG55hGgF5JXyIjcOa75CXNg6QNX+nxRu xqK7C6BLtruzQ0epz+zDptojN3/h3SA2hKYkO3CLK2bL71ZLccDLWX8prF6Lb+V5Tt62 AQQN6SUWtm/7DWTb5YqoXoyksa2tdufIoV2zo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=C4Cam7pZYC3sdTlinycpNlQUpaFIVngbSxMs1sJR63U=; b=e0GWk31dFiOKt76lnIDcQfDIOrn3FTuVIVfXkQp4+9ucx6FEl5clSp5CGDneftlndA Mm20+IntayFbLExV7Fw2gNgjrlj3KusE5aQHQNuiglZ/G30HRvqZLcimmdROsU8dspG0 XAvbB9iRciPWrNuyD2VrOJjiptPbK20XUpihia5dyfAzgvfzeT7zA06I6XbCIRMuSMby uo2hzVjD1fvMmtTbnoCVtKLGqvSwcQtGuyQsdyhCWM1K4nUdLZvncmIVMgcAaIVqyiiR ihLVFqJa4IOhXzFtjTjmW0SoSrSHOMWDURaa6BVJlYwyGeFJ2xzgsyrOSSIqPJMnLgNH qFxQ== X-Gm-Message-State: APjAAAXViwbQ1X+xA8pkhnKHiwmxaysTN7x3S50Fe1AIZD1FHKa2syus 0n9xry3/SC8IZg/xkII2baPvLA== X-Google-Smtp-Source: APXvYqxAH1ZToSKnmrjHt7rMRYNyxdRUYuzyaKwzFUGUHm1wxyVWx1sdV2A2xQJg5nxcHZPvxnUCCg== X-Received: by 2002:a7b:c3d7:: with SMTP id t23mr3707595wmj.62.1554380697549; Thu, 04 Apr 2019 05:24:57 -0700 (PDT) Received: from [192.168.51.243] ([93.152.141.58]) by smtp.gmail.com with ESMTPSA id z17sm20548629wmc.7.2019.04.04.05.24.56 (version=TLS1_3 cipher=AEAD-AES128-GCM-SHA256 bits=128/128); Thu, 04 Apr 2019 05:24:56 -0700 (PDT) Subject: Re: [PATCH net-next] net: bridge: update multicast stats from maybe_deliver() To: Pablo Neira Ayuso Cc: netdev@vger.kernel.org, davem@davemloft.net, roopa@cumulusnetworks.com, bridge@lists.linux-foundation.org, nbd@nbd.name References: <20190404115638.28592-1-pablo@netfilter.org> <952568d9-771f-982c-9a75-5dfc01a461fb@cumulusnetworks.com> <20190404122155.grjs6beng6ubt5gr@salvia> From: Nikolay Aleksandrov Message-ID: Date: Thu, 4 Apr 2019 15:24:55 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <20190404122155.grjs6beng6ubt5gr@salvia> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On 04/04/2019 15:21, Pablo Neira Ayuso wrote: > On Thu, Apr 04, 2019 at 03:02:19PM +0300, Nikolay Aleksandrov wrote: >> On 04/04/2019 14:56, Pablo Neira Ayuso wrote: >>> Simplify this code by updating bridge multicast stats from >>> maybe_deliver(). >>> >>> Note that commit 6db6f0eae605 ("bridge: multicast to unicast"), in case >>> the port flag BR_MULTICAST_TO_UNICAST is set, never updates the previous >>> port pointer, therefore it is always going to be different from the >>> existing port in this deduplicated list iteration. >>> >>> Signed-off-by: Pablo Neira Ayuso >>> --- >>> net/bridge/br_forward.c | 15 ++++----------- >>> 1 file changed, 4 insertions(+), 11 deletions(-) > > This is removing two branches, it is less code to maintain and easier > to read than: > > if (prev == p) > ack >> This was intentional, the reason I didn't add that call to maybe_deliver() is to avoid >> these checks for the standard unicast fast-path. We need to avoid touching the mcast >> cache lines (and checks) when using unicast. > > maybe_deliver() is called from br_flood() and br_multicast_flood(), > not the standard unicast fast-path. > Oh right, I was thinking of should_deliver(), my bad. > Thanks. > Acked-by: Nikolay Aleksandrov