From nobody Thu Oct 07 14:32:06 2021 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id EF69217E4189 for ; Thu, 7 Oct 2021 14:32:19 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-vs1-xe2b.google.com (mail-vs1-xe2b.google.com [IPv6:2607:f8b0:4864:20::e2b]) (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 4HQDLC5BJPz3Kfd for ; Thu, 7 Oct 2021 14:32:19 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-vs1-xe2b.google.com with SMTP id 188so7065019vsv.0 for ; Thu, 07 Oct 2021 07:32:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=jS2k05FQVpTZwBLkXmMnBPM/kawAMBa+xpvlwzMcCeI=; b=DHbX7mSrAWzXCUbHpvI9Hv4xZgk9tK402+BD2RdPyug5Zv4XR4S4QbVDzB7DUmfyk3 a86b54uIqdZyjrtv27QeSl4CI6PObIwD3CxQkPsq5Y/UEFAghyOSL7U7pZ6wSut2WGPY ZzvH7N7rcdiVbUcb7gSBEkDxpkWTkkDKwbtXkVj4IAqApdMQodujyRG5iKyKJf8Xjq1t 4YqnAUYgSzL81HlR7gvioCkgvBzdajsD/OY6yKRamcXT76JleMsQWJ5J35coh6CvMkds bc7uRObC5yUOn4+fyc5Jxb2XhdB7ygkiRIHWYe+Y8wfpWj2DNekAE/FfNoy8mqBnA3qn Qgtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=jS2k05FQVpTZwBLkXmMnBPM/kawAMBa+xpvlwzMcCeI=; b=I5SwDhCKv4raRPQ6CDqtlnCGm3AYfkzc50eGlUTF9sgRxE9D/FN9FKx5efjLx0aFjR qDPeGCukN7N35NaV9Zl8g5XZP7HWTEEC3TcyA0dmZEwePym0XZsvBCLMKVY1dfHWZnjX 3HZOWpu13PWCvZoX7q1StnYmjaVHEgj8B89P1SHxWxiVvBI+5OzHomqFpMmQN+/aLVPr cu2pSXzf8eX24LtK5pJ85tuZzqxQQR4PuwnIYAo63kKK5jNwGC6mqgSdLmmFDzBDLfHm CcJfWrB0aEUtxXUKz20JHSCPA3XtJkMxF+oYYqji9OF1di5oqJ7gS/7E8cseayWj7DUE cfYw== X-Gm-Message-State: AOAM530H3jjd1+WszUG1L24t+namHLjJqJV84AbvvcOipuhXfai32kFS S9yzLIBY4knAvgoiwJFPJZ4MDXGZE6b2vpJLtkfqO0VR+QA= X-Google-Smtp-Source: ABdhPJxnr+VYqsI6E4elcPB7WMAE3kSx2j1TzCXrQkrgrVY5CnQxIaWogHGyMoMMLLxqBtyqaMV6wd8qI2OIk8hkFEo= X-Received: by 2002:a67:ab48:: with SMTP id k8mr4515976vsh.30.1633617137857; Thu, 07 Oct 2021 07:32:17 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 References: <202110070337.1973bgRH073900@gitrepo.freebsd.org> <2898a7a27162e1ba0cd0d93b99b0975f8ad65ff5.camel@freebsd.org> In-Reply-To: <2898a7a27162e1ba0cd0d93b99b0975f8ad65ff5.camel@freebsd.org> From: Warner Losh Date: Thu, 7 Oct 2021 08:32:06 -0600 Message-ID: Subject: Re: git: 000aad3d093a - stable/12 - loader: allocate properly aligned buffer for network packet To: Ian Lepore Cc: Alexey Dokuchaev , Kyle Evans , src-committers , "" , dev-commits-src-branches@freebsd.org Content-Type: multipart/alternative; boundary="00000000000033ee3505cdc42165" X-Rspamd-Queue-Id: 4HQDLC5BJPz3Kfd X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-ThisMailContainsUnwantedMimeParts: N --00000000000033ee3505cdc42165 Content-Type: text/plain; charset="UTF-8" On Thu, Oct 7, 2021 at 8:26 AM Ian Lepore wrote: > On Thu, 2021-10-07 at 06:50 +0000, Alexey Dokuchaev wrote: > > On Thu, Oct 07, 2021 at 01:20:05AM -0500, Kyle Evans wrote: > > > On Thu, Oct 7, 2021 at 1:06 AM Alexey Dokuchaev wrote: > > > > On Thu, Oct 07, 2021 at 03:37:42AM +0000, Kyle Evans wrote: > > > > > commit 000aad3d093a376bb1104a284b4102149db43155 > > > > > > > > > > loader: allocate properly aligned buffer for network packet > > > > > > > > > > Use memalign(4, size) to ensure we have properly aligned > > > > > buffer. > > > > > > > > > > (cherry picked from commit > > > > > 659bf32dfc595b6cd6aeda7f05cb57872c64d2d1) > > > > > > > > I don't understand, so this is a merge of the commit from master > > > > (main) to > > > > stablle/12 which had then been reverted? So why do the merge in > > > > the first > > > > place? > > > > > > Because commit + revert pairs are noise in the MFC tracker that > > > distracts from actual candidates for merging. > > > > Sounds like MFC tracker should be fixed then, as now it is noise in > > the tool (tracker) vs. noise in the branch. Tools come and go, and > > code stays forever. > > > > ./danfe > > I completely disagree, and used to do this kind of mfc even before the > nifty mfc tracker came along. I see merging to older branches as a > process of replaying the commits that happened on the main branch, and > if that involves reverting and recommitting, I replay those too. > With git, though, we can squash the commits together and include muliple cherry-picked lines. This can be part of the replaying process and git supports us improving our process for things like this. Now, one could argue that the MFC track could also be improved, and that's true. However, there's other tools than just the MFC tracker that would need updating and some careful thought to balance all the concerns needs to take place, I think. What Kyle did is fine. It isn't terrible. Neither is it perfect, but it is well within the range of acceptable choices we have today. At the same time, it does highlight we could do a bit better, perhaps. Absent any guidance, though, I don't think we can expect much better. I'll add this as a possible area to explore in the git working group. Warner --00000000000033ee3505cdc42165--