From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lelnx194.ext.ti.com (lelnx194.ext.ti.com [198.47.27.80]) by arago-project.org (Postfix) with ESMTPS id 168EB52007 for ; Thu, 11 May 2017 19:12:18 +0000 (UTC) Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by lelnx194.ext.ti.com (8.15.1/8.15.1) with ESMTP id v4BJCHsF008893 for ; Thu, 11 May 2017 14:12:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com; s=ti-com-17Q1; t=1494529938; bh=ldAeWLMXGz9h5whHFC1BiSiKEG3O0bv5B3E6X+01jWM=; h=Date:From:To:CC:Subject:References:In-Reply-To; b=Iy+yocP5zqVy78p+gQIATwDZRaAmZPO50qM/s0L6X83spZg8nDhBvAqbLQGTxY5SZ F73sgnC+KGi+BrEbJBzJ8245JxKAZbyI5fLC9Rxf0ejRPVvVWGebRYHSN7Z9GmVwwn 5khuaB0lqq06bTTuN8YS/nqZEdKRxqiaLEVLgJVk= Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id v4BJCHXu013624 for ; Thu, 11 May 2017 14:12:17 -0500 Received: from dlep32.itg.ti.com (157.170.170.100) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.3.294.0; Thu, 11 May 2017 14:12:17 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id v4BJCHwb026394; Thu, 11 May 2017 14:12:17 -0500 Date: Thu, 11 May 2017 15:12:16 -0400 From: Denys Dmytriyenko To: Jason Reeder Message-ID: <20170511191216.GH32329@edge> References: <1494353215-51061-1-git-send-email-denis@denix.org> <59121D31.4050807@ti.com> <20170509200204.GD20769@edge> <20170511183246.GF32329@edge> <5914B3ED.70006@ti.com> MIME-Version: 1.0 In-Reply-To: <5914B3ED.70006@ti.com> User-Agent: Mutt/1.5.20 (2009-06-14) Cc: meta-arago@arago-project.org Subject: Re: [master][PATCH 1/6] systemd: remove first upstreamed network patch, now in 232 X-BeenThere: meta-arago@arago-project.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Arago metadata layer for TI SDKs - OE-Core/Yocto compatible List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 May 2017 19:12:18 -0000 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline On Thu, May 11, 2017 at 01:56:45PM -0500, Jason Reeder wrote: > > > On 05/11/2017 01:32 PM, Denys Dmytriyenko wrote: > > Jason, > > > > Any comments? > > > > On Tue, May 09, 2017 at 04:02:04PM -0400, Denys Dmytriyenko wrote: > >> Jason, > >> > >> Ah, you are right - it just failed to apply cleanly and I assumed it was > >> already merged in. > > Does the 0002 patch apply cleanly against 232? I just tried it locally and it > seemed to have conflicts as well. 0003 applied cleanly though. Yes, 2 and 3 still applied cleanly. Not sure if it's exact 232 release, plus there are some local patches... Here's the recipe in oe-core/master: http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-core/systemd/systemd_232.bb And it uses commit a1e2ef7ec912902d8142e7cb5830cbfb47dba86c > >> We either need to update the patch against 232, or since this is master, there > >> are high chances for systemd to be updated in OE-Core before the next release > >> later in the fall, which would have this patch integrated in upstream. > >> > >> Preferences? > > I can update the patches against 232. I just update the patches and then replace > them in the meta-arago repo right? Wasn't there a tag to use to denote upstreamed/ > backported when I send out the meta-arago patch? Thanks a lot! This is against master branches of oe-core and meta-arago, not "morty", so it won't go into any specific SDK release this year. Here's the info: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines#Patch_Header_Recommendations In this case it's either: Upstream-Status: Accepted [233] or Upstream-Status: Submitted [systemd-devel@lists.freedesktop.org] -- Denys > >> -- > >> Denys > >> > >> > >> On Tue, May 09, 2017 at 02:49:05PM -0500, Jason Reeder wrote: > >>> Denys, this first patch didn't make it into systemd until v233. The next two > >>> patches have been merged upstream but won't be in a tagged release until the > >>> upcoming v234. > >>> > >>> Jason > >>> > >>> On 05/09/2017 01:06 PM, Denys Dmytriyenko wrote: > >>>> From: Denys Dmytriyenko > >>>> > >>>> Signed-off-by: Denys Dmytriyenko > >>>> --- > >>>> ...emd-network-ipv4ll-probe-conflict-counter.patch | 48 ---------------------- > >>>> .../recipes-core/systemd/systemd_%.bbappend | 1 - > >>>> 2 files changed, 49 deletions(-) > >>>> delete mode 100644 meta-arago-distro/recipes-core/systemd/systemd/0001-libsystemd-network-ipv4ll-probe-conflict-counter.patch > >>>> > >>>> diff --git a/meta-arago-distro/recipes-core/systemd/systemd/0001-libsystemd-network-ipv4ll-probe-conflict-counter.patch b/meta-arago-distro/recipes-core/systemd/systemd/0001-libsystemd-network-ipv4ll-probe-conflict-counter.patch > >>>> deleted file mode 100644 > >>>> index 557a297..0000000 > >>>> --- a/meta-arago-distro/recipes-core/systemd/systemd/0001-libsystemd-network-ipv4ll-probe-conflict-counter.patch > >>>> +++ /dev/null > >>>> @@ -1,48 +0,0 @@ > >>>> -From 1e47842a0144c501cc6fd7ccc7996761f3e32ea9 Mon Sep 17 00:00:00 2001 > >>>> -From: Jason Reeder > >>>> -Date: Mon, 3 Apr 2017 12:07:17 -0500 > >>>> -Subject: [PATCH 1/3] libsystemd-network: ipv4ll probe conflict counter > >>>> - > >>>> -A bug exists where the conflict counter is cleared > >>>> -regardless of whether or not the next probe attempt leads to > >>>> -a successful address acquisition. This causes 'bursts' of > >>>> -MAX_CONFLICTS probes followed by a delay of > >>>> -RATE_LIMIT_INTERVAL instead of a single probe each > >>>> -RATE_LIMIT_INTERVAL when beyond MAX_CONFLICTS. > >>>> - > >>>> -The conflict counter should only be cleared after an > >>>> -address is successfully acquired. This commit achieves that > >>>> -goal. > >>>> - > >>>> -From RFC3927: > >>>> -A host should maintain a counter of the number of address > >>>> -conflicts it has experienced in the process of trying to > >>>> -acquire an address, and if the number of conflicts exceeds > >>>> -MAX_CONFLICTS then the host MUST limit the rate at which it > >>>> -probes for new addresses to no more than one new address per > >>>> -RATE_LIMIT_INTERVAL. This is to prevent catastrophic ARP > >>>> -storms in pathological failure cases, such as a rogue host > >>>> -that answers all ARP probes, causing legitimate hosts to go > >>>> -into an infinite loop attempting to select a usable address. > >>>> - > >>>> -Signed-off-by: Jason Reeder > >>>> ---- > >>>> - src/libsystemd-network/sd-ipv4acd.c | 2 -- > >>>> - 1 file changed, 2 deletions(-) > >>>> - > >>>> -diff --git a/src/libsystemd-network/sd-ipv4acd.c b/src/libsystemd-network/sd-ipv4acd.c > >>>> -index cc7436d..97f37f2 100644 > >>>> ---- a/src/libsystemd-network/sd-ipv4acd.c > >>>> -+++ b/src/libsystemd-network/sd-ipv4acd.c > >>>> -@@ -249,8 +249,6 @@ static int ipv4acd_on_timeout(sd_event_source *s, uint64_t usec, void *userdata) > >>>> - r = ipv4acd_set_next_wakeup(ll, RATE_LIMIT_INTERVAL, PROBE_WAIT); > >>>> - if (r < 0) > >>>> - goto out; > >>>> -- > >>>> -- ll->conflict = 0; > >>>> - } else { > >>>> - r = ipv4acd_set_next_wakeup(ll, 0, PROBE_WAIT); > >>>> - if (r < 0) > >>>> --- > >>>> -1.9.1 > >>>> - > >>>> diff --git a/meta-arago-distro/recipes-core/systemd/systemd_%.bbappend b/meta-arago-distro/recipes-core/systemd/systemd_%.bbappend > >>>> index 8fccdb5..5f54316 100644 > >>>> --- a/meta-arago-distro/recipes-core/systemd/systemd_%.bbappend > >>>> +++ b/meta-arago-distro/recipes-core/systemd/systemd_%.bbappend > >>>> @@ -14,7 +14,6 @@ SRC_URI_append = " \ > >>>> file://30-wlan.network \ > >>>> file://60-usb.network \ > >>>> file://sync-clocks.service \ > >>>> - file://0001-libsystemd-network-ipv4ll-probe-conflict-counter.patch \ > >>>> file://0002-libsystemd-network-sd-ipv4ll-Wrapper-to-restart-addr.patch \ > >>>> file://0003-libsystemd-network-sd-ipv4ll-acquire-new-address-aft.patch \ > >>>> " > >>>> > >>> > >>> -- > >>> Jason Reeder > >>> _______________________________________________ > >>> meta-arago mailing list > >>> meta-arago@arago-project.org > >>> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago > >> _______________________________________________ > >> meta-arago mailing list > >> meta-arago@arago-project.org > >> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago > > -- > Jason Reeder