From owner-dev-commits-src-all@freebsd.org Thu Feb 4 22:59:41 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 01B0C53243B; Thu, 4 Feb 2021 22:59:41 +0000 (UTC) (envelope-from rob.fx907@gmail.com) Received: from mail-oi1-x230.google.com (mail-oi1-x230.google.com [IPv6:2607:f8b0:4864:20::230]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DWvBh6TGGz3KTt; Thu, 4 Feb 2021 22:59:40 +0000 (UTC) (envelope-from rob.fx907@gmail.com) Received: by mail-oi1-x230.google.com with SMTP id m7so5476226oiw.12; Thu, 04 Feb 2021 14:59:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=JCW8DKbgrNIRCcT7Nl9UCt2G+fKTq9upCpSmxZ8TWnY=; b=YF7m26ShpkH3P3tbvWfYEbl78K5Tnq/axMXPRNNIol7YczjtdoSnfXsB9Ils1srqCT MQsL4RsB168svPJdIJ0WSBoeBkVPS54w+VamDSgG0M5E5wiBJvhI5veVNqE2RM6ztSyw p/I1Z1KbpjUbMm/MsFZfFJERHjLcvoyqkmyivSU9f5JwWFbZgpzExzFbXmkkuzWrxpVx gerWGvIfbEPgok4nomaB7FJlA8sfDVTOEybj0apscfCw8kqe7HJPTvIiIAV+UxvePxx9 2UH0RIjEocne8hmbrOhbAaCTmjGjEl5jSbAOqSVVMxcSik2R9AHi9luQVvND0OQZdM3e bMtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=JCW8DKbgrNIRCcT7Nl9UCt2G+fKTq9upCpSmxZ8TWnY=; b=k4T9FGa2NZkH39hcjmbLarvP20vmbkAJ5Y8adjrIQ0Th6spV06wRSwQzYsij8xU9tD 2AMAk66cxm4CX3s1eQ9w37+ENRpXN9bdzYWH60iNi7EW32zzvaOvomdPRkt2XCrpdxtl zIkEUlxgmrlNSryvLUZOnUPAlfXwzBTp0EXJ6TMhheU4COEVhtkTW6AwwhLalTngTAZt /cSxlYO4voDbwEhuLgxvpQwte7qEmGHOLJp9BELgrSnLAQwpl9Xe1kFig/zoPM3tDyyu Z+RGK05gACiysEyrTs1yOgcGNJ2XRNWcr0FyftByuqKzqU6vpS7yt+rvVWzYILaWJcVg ir+w== X-Gm-Message-State: AOAM533Qca5LHkaf3BcSLIsB6yr44FQDxF3aOCvP53DaM4BVdE+tmh0S ssfw/e73B2aZ6k0GJCNO56HbZqPejZdl25HIwTcmYU01ibs= X-Google-Smtp-Source: ABdhPJx4HsXVt4pGR4yUVZiGQyxRhKF0syU52p6A0r4lxsjKMoJxMq5NQcBhK+KJTD9YtjnTCwVSH8z7fukAtSKolEk= X-Received: by 2002:a05:6808:8a:: with SMTP id s10mr1253858oic.152.1612479579877; Thu, 04 Feb 2021 14:59:39 -0800 (PST) MIME-Version: 1.0 Received: by 2002:ac9:3170:0:0:0:0:0 with HTTP; Thu, 4 Feb 2021 14:59:39 -0800 (PST) In-Reply-To: <202102042234.114MYu5E007554@gitrepo.freebsd.org> References: <202102042234.114MYu5E007554@gitrepo.freebsd.org> From: Rob Wing Date: Thu, 4 Feb 2021 13:59:39 -0900 Message-ID: Subject: Re: git: f5f50ec15688 - stable/13 - MFC ab6d9aaed76e: Move business logic from rebuild_fd_callout() into rebuild_fd(). To: "Alexander V. Chernikov" Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-branches@freebsd.org" X-Rspamd-Queue-Id: 4DWvBh6TGGz3KTt X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; TAGGED_FROM(0.00)[] Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Feb 2021 22:59:41 -0000 I=E2=80=99m not opinionated on this, only pointing out that most MFC commit= s lately have trended towards using git cherry-pick and dropping the MFC: xxxxxx in the commit message. I know Warner encourages this, as documented at https://github.com/bsdimp/freebsd-git-docs/blob/main/MFC.md#marking-mfcs -Rob On Thursday, February 4, 2021, Alexander V. Chernikov wrote: > The branch stable/13 has been updated by melifaro: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D > f5f50ec15688d6aab67d3fb8fb0c98b89e4dbce0 > > commit f5f50ec15688d6aab67d3fb8fb0c98b89e4dbce0 > Author: Alexander V. Chernikov > AuthorDate: 2021-01-30 22:32:42 +0000 > Commit: Alexander V. Chernikov > CommitDate: 2021-02-04 22:34:15 +0000 > > MFC ab6d9aaed76e: Move business logic from rebuild_fd_callout() into > rebuild_fd(). > > This simplifies code a bit and allows for future non-callout > callers to request rebuild. > --- > sys/net/route/fib_algo.c | 40 +++++++++++++++++++++++++--------------- > 1 file changed, 25 insertions(+), 15 deletions(-) > > diff --git a/sys/net/route/fib_algo.c b/sys/net/route/fib_algo.c > index 1f040ad259c5..f7a8b3f82431 100644 > --- a/sys/net/route/fib_algo.c > +++ b/sys/net/route/fib_algo.c > @@ -155,6 +155,7 @@ struct fib_data { > TAILQ_ENTRY(fib_data) entries; /* list of all fds in vne= t > */ > }; > > +static bool rebuild_fd(struct fib_data *fd); > static void rebuild_fd_callout(void *_data); > static void destroy_fd_instance_epoch(epoch_context_t ctx); > static enum flm_op_result attach_datapath(struct fib_data *fd); > @@ -1011,13 +1012,28 @@ setup_fd_instance(struct fib_lookup_module *flm, > struct rib_head *rh, > static void > rebuild_fd_callout(void *_data) > { > - struct fib_data *fd, *fd_new, *fd_tmp; > + struct fib_data *fd =3D (struct fib_data *)_data; > + > + FD_PRINTF(LOG_INFO, fd, "running callout rebuild"); > + > + CURVNET_SET(fd->fd_vnet); > + rebuild_fd(fd); > + CURVNET_RESTORE(); > +} > + > +/* > + * Tries to create new algo instance based on @fd data. > + * Returns true on success. > + */ > +static bool > +rebuild_fd(struct fib_data *fd) > +{ > + struct fib_data *fd_new, *fd_tmp; > struct fib_lookup_module *flm_new =3D NULL; > struct epoch_tracker et; > enum flm_op_result result; > bool need_rebuild =3D false; > > - fd =3D (struct fib_data *)_data; > > FIB_MOD_LOCK(); > need_rebuild =3D fd->fd_need_rebuild; > @@ -1026,15 +1042,12 @@ rebuild_fd_callout(void *_data) > fd->fd_num_changes =3D 0; > FIB_MOD_UNLOCK(); > > - CURVNET_SET(fd->fd_vnet); > - > /* First, check if we're still OK to use this algo */ > if (!is_algo_fixed(fd->fd_rh)) > flm_new =3D fib_check_best_algo(fd->fd_rh, fd->fd_flm); > if ((flm_new =3D=3D NULL) && (!need_rebuild)) { > /* Keep existing algo, no need to rebuild. */ > - CURVNET_RESTORE(); > - return; > + return (true); > } > > if (flm_new =3D=3D NULL) { > @@ -1051,19 +1064,16 @@ rebuild_fd_callout(void *_data) > } > if (result !=3D FLM_SUCCESS) { > FD_PRINTF(LOG_NOTICE, fd, "table rebuild failed"); > - CURVNET_RESTORE(); > - return; > + return (false); > } > FD_PRINTF(LOG_INFO, fd_new, "switched to new instance"); > > - /* Remove old instance removal */ > - if (fd !=3D NULL) { > - NET_EPOCH_ENTER(et); > - schedule_destroy_fd_instance(fd, true); > - NET_EPOCH_EXIT(et); > - } > + /* Remove old instance */ > + NET_EPOCH_ENTER(et); > + schedule_destroy_fd_instance(fd, true); > + NET_EPOCH_EXIT(et); > > - CURVNET_RESTORE(); > + return (true); > } > > /* >