[Thud][PATCH 1/3] lttng-ust: update to 2.10.3

[Thud][PATCH 1/3] lttng-ust: update to 2.10.3

[Jonathan Rajotte]

Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
---
 .../lttng/{lttng-ust_2.10.1.bb => lttng-ust_2.10.3.bb}        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-kernel/lttng/{lttng-ust_2.10.1.bb => lttng-ust_2.10.3.bb} (90%)

diff --git a/meta/recipes-kernel/lttng/lttng-ust_2.10.1.bb b/meta/recipes-kernel/lttng/lttng-ust_2.10.3.bb
similarity index 90%
rename from meta/recipes-kernel/lttng/lttng-ust_2.10.1.bb
rename to meta/recipes-kernel/lttng/lttng-ust_2.10.3.bb
index d79a47931c..b5c43200d6 100644
--- a/meta/recipes-kernel/lttng/lttng-ust_2.10.1.bb
+++ b/meta/recipes-kernel/lttng/lttng-ust_2.10.3.bb
@@ -23,8 +23,8 @@ PE = "2"
 SRC_URI = "https://lttng.org/files/lttng-ust/lttng-ust-${PV}.tar.bz2 \
            file://lttng-ust-doc-examples-disable.patch \
           "
-SRC_URI[md5sum] = "4863cc2f9f0a070b42438bb646bbba06"
-SRC_URI[sha256sum] = "07cc3c0b71e7b77f1913d5b7f340a78a9af414440e4662712aef2d635b88ee9d"
+SRC_URI[md5sum] = "ffcfa8c1ba9a52f002d240e936e9afa2"
+SRC_URI[sha256sum] = "9e8420f90d5f963f7aa32bc6d44adc1e491136f687c69ffb7a3075d33b40852b"
 
 CVE_PRODUCT = "ust"
 
-- 
2.17.1

[Thud][PATCH 2/3] lttng-modules: update to 2.10.9

[Jonathan Rajotte]

Drop patch [1] since it is part of the 2.10.9 release.

[1] lttng-modules/0001-Fix-net-expose-sk-wmem-in-sock_exceed_buf_limit-trac.patch

Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
---
 ...k-wmem-in-sock_exceed_buf_limit-trac.patch | 67 -------------------
 ...ules_2.10.7.bb => lttng-modules_2.10.9.bb} |  5 +-
 2 files changed, 2 insertions(+), 70 deletions(-)
 delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-Fix-net-expose-sk-wmem-in-sock_exceed_buf_limit-trac.patch
 rename meta/recipes-kernel/lttng/{lttng-modules_2.10.7.bb => lttng-modules_2.10.9.bb} (85%)

diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-net-expose-sk-wmem-in-sock_exceed_buf_limit-trac.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-net-expose-sk-wmem-in-sock_exceed_buf_limit-trac.patch
deleted file mode 100644
index 92e12df177..0000000000
--- a/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-net-expose-sk-wmem-in-sock_exceed_buf_limit-trac.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 9e67b4c94b94493123d38379bd9b3eceae23a6f1 Mon Sep 17 00:00:00 2001
-From: Michael Jeanson <mjeanson@efficios.com>
-Date: Fri, 7 Sep 2018 12:21:12 -0400
-Subject: [PATCH] Fix: net: expose sk wmem in sock_exceed_buf_limit tracepoint
- (4.19)
-
-See upstream commit:
-
-  commit d6f19938eb031ee2158272757db33258153ae59c
-  Author: Yafang Shao <laoar.shao@gmail.com>
-  Date:   Sun Jul 1 23:31:30 2018 +0800
-
-    net: expose sk wmem in sock_exceed_buf_limit tracepoint
-
-    Currently trace_sock_exceed_buf_limit() only show rmem info,
-    but wmem limit may also be hit.
-    So expose wmem info in this tracepoint as well.
-
-    Regarding memcg, I think it is better to introduce a new tracepoint(if
-    that is needed), i.e. trace_memcg_limit_hit other than show memcg info in
-    trace_sock_exceed_buf_limit.
-
-Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
-Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
-Upstream-Status: Backport
-Signed-off-by: He Zhe <zhe.he@windriver.com>
----
- instrumentation/events/lttng-module/sock.h | 23 ++++++++++++++++++++++-
- 1 file changed, 22 insertions(+), 1 deletion(-)
-
-diff --git a/instrumentation/events/lttng-module/sock.h b/instrumentation/events/lttng-module/sock.h
-index 5cd02ca..cd0c92b 100644
---- a/instrumentation/events/lttng-module/sock.h
-+++ b/instrumentation/events/lttng-module/sock.h
-@@ -21,7 +21,28 @@ LTTNG_TRACEPOINT_EVENT(sock_rcvqueue_full,
- 	)
- )
- 
--#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0))
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,19,0))
-+
-+LTTNG_TRACEPOINT_EVENT(sock_exceed_buf_limit,
-+
-+	TP_PROTO(struct sock *sk, struct proto *prot, long allocated, int kind),
-+
-+	TP_ARGS(sk, prot, allocated, kind),
-+
-+	TP_FIELDS(
-+		ctf_string(name, prot->name)
-+		ctf_array(long, sysctl_mem, prot->sysctl_mem, 3)
-+		ctf_integer(long, allocated, allocated)
-+		ctf_integer(int, sysctl_rmem, sk_get_rmem0(sk, prot))
-+		ctf_integer(int, rmem_alloc, atomic_read(&sk->sk_rmem_alloc))
-+		ctf_integer(int, sysctl_wmem, sk_get_wmem0(sk, prot))
-+		ctf_integer(int, wmem_alloc, refcount_read(&sk->sk_wmem_alloc))
-+		ctf_integer(int, wmem_queued, sk->sk_wmem_queued)
-+		ctf_integer(int, kind, kind)
-+	)
-+)
-+
-+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0))
- 
- LTTNG_TRACEPOINT_EVENT(sock_exceed_buf_limit,
- 
--- 
-2.7.4
-
diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.10.7.bb b/meta/recipes-kernel/lttng/lttng-modules_2.10.9.bb
similarity index 85%
rename from meta/recipes-kernel/lttng/lttng-modules_2.10.7.bb
rename to meta/recipes-kernel/lttng/lttng-modules_2.10.9.bb
index f6c865a875..d297377755 100644
--- a/meta/recipes-kernel/lttng/lttng-modules_2.10.7.bb
+++ b/meta/recipes-kernel/lttng/lttng-modules_2.10.9.bb
@@ -15,11 +15,10 @@ COMPATIBLE_HOST = '(x86_64|i.86|powerpc|aarch64|mips|nios2|arm).*-linux'
 SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \
            file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \
            file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \
-           file://0001-Fix-net-expose-sk-wmem-in-sock_exceed_buf_limit-trac.patch \
 "
 
-SRC_URI[md5sum] = "d3cb4520948083bf1573a2e4cb7406aa"
-SRC_URI[sha256sum] = "f049428d3d131e103a7a7038d184731bf7bcdce00503fc19a2c9b5693ecbb3b5"
+SRC_URI[md5sum] = "09df0ac2e8f245740a2f32411d10c0d1"
+SRC_URI[sha256sum] = "a1855bbd02d0f71ebd180e9872309862036624f012442ab9cc5852eb60340145"
 
 export INSTALL_MOD_DIR="kernel/lttng-modules"
 
-- 
2.17.1

[Thud][PATCH 3/3] lttng-tools: update to 2.9.11

[Jonathan Rajotte]

Update 0001-Allow-multiple-attempts-to-connect-to-relayd.patch chunk
accordingly.

Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
---
 ...multiple-attempts-to-connect-to-relayd.patch | 17 ++++++++---------
 ...tng-tools_2.9.5.bb => lttng-tools_2.9.11.bb} |  4 ++--
 2 files changed, 10 insertions(+), 11 deletions(-)
 rename meta/recipes-kernel/lttng/{lttng-tools_2.9.5.bb => lttng-tools_2.9.11.bb} (97%)

diff --git a/meta/recipes-kernel/lttng/lttng-tools/0001-Allow-multiple-attempts-to-connect-to-relayd.patch b/meta/recipes-kernel/lttng/lttng-tools/0001-Allow-multiple-attempts-to-connect-to-relayd.patch
index 62a0978592..0998fc3860 100644
--- a/meta/recipes-kernel/lttng/lttng-tools/0001-Allow-multiple-attempts-to-connect-to-relayd.patch
+++ b/meta/recipes-kernel/lttng/lttng-tools/0001-Allow-multiple-attempts-to-connect-to-relayd.patch
@@ -16,17 +16,17 @@ Signed-off-by: Mikael Beckius <mikael.beckius@windriver.com>
 Signed-off-by: He Zhe <zhe.he@windriver.com>
 Upstream-Status: Pending
 ---
- src/bin/lttng-sessiond/cmd.c |    8 --------
+ src/bin/lttng-sessiond/cmd.c | 8 --------
  1 file changed, 8 deletions(-)
 
 diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
-index 73b4ce3..36f62ee 100644
+index cf30b8e..cc41a48 100644
 --- a/src/bin/lttng-sessiond/cmd.c
 +++ b/src/bin/lttng-sessiond/cmd.c
-@@ -689,14 +689,6 @@ close_sock:
- 	free(rsock);
+@@ -945,14 +945,6 @@ static int send_consumer_relayd_socket(enum lttng_domain_type domain,
+ 	 */
  
- error:
+ close_sock:
 -	if (ret != LTTNG_OK) {
 -		/*
 -		 * The consumer output for this session should not be used anymore
@@ -35,9 +35,8 @@ index 73b4ce3..36f62ee 100644
 -		 */
 -		consumer->enabled = 0;
 -	}
- 	return ret;
- }
+ 	(void) relayd_close(rsock);
+ 	free(rsock);
  
 -- 
-1.7.9.5
-
+2.17.1
diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.9.5.bb b/meta/recipes-kernel/lttng/lttng-tools_2.9.11.bb
similarity index 97%
rename from meta/recipes-kernel/lttng/lttng-tools_2.9.5.bb
rename to meta/recipes-kernel/lttng/lttng-tools_2.9.11.bb
index 0314b53637..5e3fc1aab2 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_2.9.5.bb
+++ b/meta/recipes-kernel/lttng/lttng-tools_2.9.11.bb
@@ -34,8 +34,8 @@ SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \
            file://lttng-sessiond.service \
            "
 
-SRC_URI[md5sum] = "051224eb991aee07f8721ff1877d0b96"
-SRC_URI[sha256sum] = "77839eb6fc6c652125f08acfd9369701c2516eb05cc2084160e7efc7a3fb731c"
+SRC_URI[md5sum] = "f9c2b35810790f5bd802483eb14cb301"
+SRC_URI[sha256sum] = "2c45144acf8dc6fcd655be7370a022e9c03c8b7419af489c9c2e786a335006db"
 
 inherit autotools ptest pkgconfig useradd python3-dir manpages systemd
 
-- 
2.17.1

Re: [Thud][PATCH 1/3] lttng-ust: update to 2.10.3

[Jonathan Rajotte-Julien]

Hi,

Disregard this series. It does not follow the project guideline regarding recipe
update for stable release.

Thanks

On Wed, Mar 13, 2019 at 08:55:53PM +0000, Jonathan Rajotte wrote:
> Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
> ---
>  .../lttng/{lttng-ust_2.10.1.bb => lttng-ust_2.10.3.bb}        | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>  rename meta/recipes-kernel/lttng/{lttng-ust_2.10.1.bb => lttng-ust_2.10.3.bb} (90%)
> 
> diff --git a/meta/recipes-kernel/lttng/lttng-ust_2.10.1.bb b/meta/recipes-kernel/lttng/lttng-ust_2.10.3.bb
> similarity index 90%
> rename from meta/recipes-kernel/lttng/lttng-ust_2.10.1.bb
> rename to meta/recipes-kernel/lttng/lttng-ust_2.10.3.bb
> index d79a47931c..b5c43200d6 100644
> --- a/meta/recipes-kernel/lttng/lttng-ust_2.10.1.bb
> +++ b/meta/recipes-kernel/lttng/lttng-ust_2.10.3.bb
> @@ -23,8 +23,8 @@ PE = "2"
>  SRC_URI = "https://lttng.org/files/lttng-ust/lttng-ust-${PV}.tar.bz2 \
>             file://lttng-ust-doc-examples-disable.patch \
>            "
> -SRC_URI[md5sum] = "4863cc2f9f0a070b42438bb646bbba06"
> -SRC_URI[sha256sum] = "07cc3c0b71e7b77f1913d5b7f340a78a9af414440e4662712aef2d635b88ee9d"
> +SRC_URI[md5sum] = "ffcfa8c1ba9a52f002d240e936e9afa2"
> +SRC_URI[sha256sum] = "9e8420f90d5f963f7aa32bc6d44adc1e491136f687c69ffb7a3075d33b40852b"
>  
>  CVE_PRODUCT = "ust"
>  
> -- 
> 2.17.1
> 

-- 
Jonathan Rajotte-Julien
EfficiOS

Re: [Thud][PATCH 1/3] lttng-ust: update to 2.10.3

[akuster808]

Jonathan,

On 3/13/19 3:47 PM, Jonathan Rajotte-Julien wrote:
> Hi,
>
> Disregard this series. It does not follow the project guideline regarding recipe
> update for stable release.
There are exceptions when a package update is a bugfix only change. I
know the kernel, openssl, bind, curl and a few others fall into that
category. Many minor version updates tend to be  bug fix only but that
all depends on the upstream project policies. Binutils does not follow
that scheme as they add features in minor version updates. This is what
I know from personal experience. What helps the project along with the
maintainer is  having a brief summary of the changes in the commit
message. I am at the mercy of commit message.

Can you confirm this is bug fix only update?

regards,
Armin


> Thanks
>
> On Wed, Mar 13, 2019 at 08:55:53PM +0000, Jonathan Rajotte wrote:
>> Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
>> ---
>>  .../lttng/{lttng-ust_2.10.1.bb => lttng-ust_2.10.3.bb}        | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>  rename meta/recipes-kernel/lttng/{lttng-ust_2.10.1.bb => lttng-ust_2.10.3.bb} (90%)
>>
>> diff --git a/meta/recipes-kernel/lttng/lttng-ust_2.10.1.bb b/meta/recipes-kernel/lttng/lttng-ust_2.10.3.bb
>> similarity index 90%
>> rename from meta/recipes-kernel/lttng/lttng-ust_2.10.1.bb
>> rename to meta/recipes-kernel/lttng/lttng-ust_2.10.3.bb
>> index d79a47931c..b5c43200d6 100644
>> --- a/meta/recipes-kernel/lttng/lttng-ust_2.10.1.bb
>> +++ b/meta/recipes-kernel/lttng/lttng-ust_2.10.3.bb
>> @@ -23,8 +23,8 @@ PE = "2"
>>  SRC_URI = "https://lttng.org/files/lttng-ust/lttng-ust-${PV}.tar.bz2 \
>>             file://lttng-ust-doc-examples-disable.patch \
>>            "
>> -SRC_URI[md5sum] = "4863cc2f9f0a070b42438bb646bbba06"
>> -SRC_URI[sha256sum] = "07cc3c0b71e7b77f1913d5b7f340a78a9af414440e4662712aef2d635b88ee9d"
>> +SRC_URI[md5sum] = "ffcfa8c1ba9a52f002d240e936e9afa2"
>> +SRC_URI[sha256sum] = "9e8420f90d5f963f7aa32bc6d44adc1e491136f687c69ffb7a3075d33b40852b"
>>  
>>  CVE_PRODUCT = "ust"
>>  
>> -- 
>> 2.17.1
>>

Re: [Thud][PATCH 1/3] lttng-ust: update to 2.10.3

[Jonathan Rajotte-Julien]

> > Disregard this series. It does not follow the project guideline regarding recipe
> > update for stable release.
> There are exceptions when a package update is a bugfix only change. I
> know the kernel, openssl, bind, curl and a few others fall into that
> category. Many minor version updates tend to be  bug fix only but that
> all depends on the upstream project policies. Binutils does not follow
> that scheme as they add features in minor version updates. This is what
> I know from personal experience. What helps the project along with the
> maintainer is  having a brief summary of the changes in the commit
> message. I am at the mercy of commit message.

I get that. I assumed that most project are *sane* and stick to something
similar to SemVer. Sorry for that.

We follow SemVer [1] for the following projects:

    Babeltrace
    LTTng-tools
    LTTng-ust
    LTTng-modules
    userspace-rcu

This series contains only PATCH level update (MAJOR.MINOR.PATCH).

You will note that the lttng-tools recipes was not updated to the 2.10.x release
in this series.

Side note, as a project (lttng) we recommend that lttng-tools and lttng-ust be
upgraded in lockstep (MINOR == MINOR). But since we also conform to SemVer there
is no problem using an older MINOR version of lttng-tools with a newer MINOR
version of lttng-ust. The other way around is not recommended and will simply
not build most of the time.

lttng-modules is *special* since we fix thing to allow support of
newer kernel as time goes by. Again, we do not add features across PATCH level
release.

Still, I think I understand a bit more the constraint oe-core and yocto stable
branch are facing and would not mind if the recipes stay at the version they are
now.

[1] https://semver.org/

> 
> Can you confirm this is bug fix only update?
>

Yes it is.

Cheers

-- 
Jonathan Rajotte-Julien
EfficiOS

Re: [Thud][PATCH 1/3] lttng-ust: update to 2.10.3

[akuster808]

On 3/14/19 9:29 AM, Jonathan Rajotte-Julien wrote:
>>> Disregard this series. It does not follow the project guideline regarding recipe
>>> update for stable release.
>> There are exceptions when a package update is a bugfix only change. I
>> know the kernel, openssl, bind, curl and a few others fall into that
>> category. Many minor version updates tend to be  bug fix only but that
>> all depends on the upstream project policies. Binutils does not follow
>> that scheme as they add features in minor version updates. This is what
>> I know from personal experience. What helps the project along with the
>> maintainer is  having a brief summary of the changes in the commit
>> message. I am at the mercy of commit message.
> I get that. I assumed that most project are *sane* and stick to something
> similar to SemVer. Sorry for that.
>
> We follow SemVer [1] for the following projects:
>
>     Babeltrace
>     LTTng-tools
>     LTTng-ust
>     LTTng-modules
>     userspace-rcu
>
> This series contains only PATCH level update (MAJOR.MINOR.PATCH).
>
> You will note that the lttng-tools recipes was not updated to the 2.10.x release
> in this series.
>
> Side note, as a project (lttng) we recommend that lttng-tools and lttng-ust be
> upgraded in lockstep (MINOR == MINOR). But since we also conform to SemVer there
> is no problem using an older MINOR version of lttng-tools with a newer MINOR
> version of lttng-ust. The other way around is not recommended and will simply
> not build most of the time.
>
> lttng-modules is *special* since we fix thing to allow support of
> newer kernel as time goes by. Again, we do not add features across PATCH level
> release.
>
> Still, I think I understand a bit more the constraint oe-core and yocto stable
> branch are facing and would not mind if the recipes stay at the version they are
> now.
>
> [1] https://semver.org/

Thank you for the explanation. This will help me moving forward.
>
>> Can you confirm this is bug fix only update?
>>
> Yes it is.
Great. I took your series and have them in the builds.

regards,
Armin

>
> Cheers
>