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=-7.0 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED 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 DEA1AC433E0 for ; Fri, 24 Jul 2020 19:13:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BBB25206F0 for ; Fri, 24 Jul 2020 19:13:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="dKBBgCOw" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726607AbgGXTNI (ORCPT ); Fri, 24 Jul 2020 15:13:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35306 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726416AbgGXTNI (ORCPT ); Fri, 24 Jul 2020 15:13:08 -0400 Received: from mail-lj1-x242.google.com (mail-lj1-x242.google.com [IPv6:2a00:1450:4864:20::242]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 20CFEC0619D3 for ; Fri, 24 Jul 2020 12:13:08 -0700 (PDT) Received: by mail-lj1-x242.google.com with SMTP id x9so11057320ljc.5 for ; Fri, 24 Jul 2020 12:13:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=XeBXoqXvoZOUWYA0uSHWWga3AkdX5vyutNg8ZrXSAQY=; b=dKBBgCOwDmZGz2DegDgyCK4t2bkYC9ZFFM6hnk9e5qhbOhxr4hKvbWkU48ymwuj4ZH ftlMkPiMoQkEbvGhzmUxLTo5iAJrlhlqc6vnaUQ+fzIrXyUnd1rsFgbPKKPCDVYc753K uRVGaK9Wu2p793cZ+ZU2BpN0K0JEJiVkWw/Am4WEDBBMeHiWR2+CIu317J66h0Frrt1O 1Gs5+utSxh3lUr4qiHCgS0LzjwZ3EOfWye6U78TujNWXBPDomC6oCPowQQJ/qcpTXWGr W5dduQ6eZkQVBHzFWuwCrMY+HYJA4bGGQUEfK0JWpgQ5mwDQWk5kgGsTKGuleeKf0zGJ ByuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=XeBXoqXvoZOUWYA0uSHWWga3AkdX5vyutNg8ZrXSAQY=; b=eo//YWlF8eQnk0o8QgiXdOsWcdavzNku8Mx0QT6M8ctz+YM7yl0cnyu1SOL8XKf1SJ OI/DCXB08d2bkbkAJhZezT/DGBB0N+DW2GAOO6JX5bQZFZ3D+RQjDuxCGkMdDtW9WpJC WEw1Mejjvsr/fBZk6uGaziF1vne6u33bOUCzu1XxjobghEZxUDlOnYXE6O7YfdlTh69P iIYnAANeTvMqVgxX4Vd1dS2TW96wgwHTWZcWPhB9rbcoVDzfothHe7W+GcKk9U3YRw6H TNKiQ/MkqYHnXkaB5A35e+UvrSOk86Ufr+2Se+Fnwsf4csBpiDRpwoEEBH1axFuip6WD k4pw== X-Gm-Message-State: AOAM530SxYjJnDCZss5pkibMNNGzpttEJtNjT7ezkZj65bAZLvY9GVML K7GmeFBfibuVYMAZdovfxGfFAnmSUEwcggRDqK8= X-Google-Smtp-Source: ABdhPJzeME8Til+yUpnnJ7Sw0VQtu4Sa6tcUr1HC5aIxfRHmBKG3ivXQVsGiGcIh0O3oMmlPDCGdNWLcDPJtmsMI/5g= X-Received: by 2002:a2e:8357:: with SMTP id l23mr4677409ljh.290.1595617986369; Fri, 24 Jul 2020 12:13:06 -0700 (PDT) MIME-Version: 1.0 References: <20200723.151051.16194602184853977.davem@davemloft.net> <20200724061304.14997-1-kuniyu@amazon.co.jp> In-Reply-To: From: Alexei Starovoitov Date: Fri, 24 Jul 2020 12:12:55 -0700 Message-ID: Subject: Re: [PATCH net] udp: Remove an unnecessary variable in udp[46]_lib_lookup2(). To: Willem de Bruijn Cc: Kuniyuki Iwashima , David Miller , Alexei Starovoitov , Daniel Borkmann , Jakub Sitnicki , Jakub Kicinski , Kuniyuki Iwashima , Network Development Content-Type: text/plain; charset="UTF-8" Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Fri, Jul 24, 2020 at 6:38 AM Willem de Bruijn wrote: > > On Fri, Jul 24, 2020 at 2:13 AM Kuniyuki Iwashima wrote: > > > > From: David Miller > > Date: Thu, 23 Jul 2020 15:10:51 -0700 (PDT) > > > From: Kuniyuki Iwashima > > > Date: Thu, 23 Jul 2020 01:52:27 +0900 > > > > > > > This patch removes an unnecessary variable in udp[46]_lib_lookup2() and > > > > makes it easier to resolve a merge conflict with bpf-next reported in > > > > the link below. > > > > > > > > Link: https://lore.kernel.org/linux-next/20200722132143.700a5ccc@canb.auug.org.au/ > > > > Fixes: efc6b6f6c311 ("udp: Improve load balancing for SO_REUSEPORT.") > > > > Signed-off-by: Kuniyuki Iwashima > > > > Signed-off-by: Jakub Sitnicki > > > > Cc: Willem de Bruijn > > > > > > This doesn't apply to net-next. > > > > Yes. I think this kind of patch should be submitted to net-next, but this > > is for the net tree. Please let me add more description. > > > > Currently, the net and net-next trees conflict in udp[46]_lib_lookup2() > > between > > > > efc6b6f6c311 ("udp: Improve load balancing for SO_REUSEPORT.") > > > > and > > > > 7629c73a1466 ("udp: Extract helper for selecting socket from reuseport group") > > 2a08748cd384 ("udp6: Extract helper for selecting socket from reuseport group") > > . > > > > The conflict is reported in the link[0] and Jakub suggested how to resolve > > it[1]. To ease the merge conflict, Jakub and I have to send follow up patches to > > the bpf-next and net trees. > > > > Now, his patchset (7629c73a1466 and 2a08748cd384) to bpf-next is merged > > into net-next, and his follow up patch is applied in bpf-next[2]. > > > > I fixed a bug in efc6b6f6c311, but it introduced an unnecessary variable > > and made the conflict worse. So I sent this follow up patch to net tree. > > > > However, I do not know the best way to resolve the conflict, so any comments > > are welcome. > > Perhaps simpler is to apply this change to bpf-next: I'm fine whichever way. Could you please submit an official patch?