From patchwork Thu Feb 15 14:07:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Krummenacher X-Patchwork-Id: 39316 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 79CEBC4829E for ; Thu, 15 Feb 2024 14:09:17 +0000 (UTC) Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com [209.85.218.52]) by mx.groups.io with SMTP id smtpd.web10.14466.1708006150890932075 for ; Thu, 15 Feb 2024 06:09:11 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Xy0KrCn1; spf=pass (domain: gmail.com, ip: 209.85.218.52, mailfrom: max.oss.09@gmail.com) Received: by mail-ej1-f52.google.com with SMTP id a640c23a62f3a-a3d54555692so92346566b.1 for ; Thu, 15 Feb 2024 06:09:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708006148; x=1708610948; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=VuaxwWii2I+r0i22tWD+r+T8ERyLYVqu7BSvZZl8AQg=; b=Xy0KrCn1ggAugOJEL+ezV65IbPHvFipKx6Z8wVw0F7vK1s8/2KZ4Rj0pedcQzhdKCo T+gMXb27Q9iFn7DbzjgJOuEntzwLmZxxY2EfUst6I+Et8ouswt4N7gIPDY7rT5y6sYdC nRKrU3ZWHZF1on5gXJuqs5zl4/6CsrIOMt7hI1npJVjHPf3vMxs2fn03DrQcqNEbqoFs zGAYbbCDMwHpjNPoq952DctJKCQj6Eb22WGnxRT2SdpP8yorROI1QtYlP6m13jX/LhMf 3xhe8sHSHZSsdrASTcA+qwPBrfmnhcqBOMD+K5W9GcJ+nJOu7sLm+y7xvQIUqdeG1bvc yBWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708006148; x=1708610948; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=VuaxwWii2I+r0i22tWD+r+T8ERyLYVqu7BSvZZl8AQg=; b=WSwBueu2Pze//rCW5D49KcjMp2DC9Mso1d5ldnfZkSqtoQJuV8CIpAAD3E4i+bdX1I S+cHEfQhMa5JhaPzmp6nwRtF/xoPYYCPacT98qaqcl3R7YRsiyF/EVvvlK27TDevlRJ/ rysFNC6FJcNR3uH262TdIXL7Y6RMRmoiR/sqTlch5G6fySKaeajPth9ihbsiZzxU3Yu1 Tv0VoqKai5hXlii0umZ6DoSA+mjxM+IZSj0g+LNB+aiPaKSGavyHiZOGvfXYsU0sgAQZ p44hRFGsSeXC6m+KA0nUzGSP2CfaZC77UN2QrOC/9B+Im5yDHwuXgrSNQEERWaeEa10k tq9Q== X-Gm-Message-State: AOJu0YzXVSWxSHjyDGhuEwwgHJlXZO20l8pEqBm0TDMfiHNxJpAsiRFd XApRm9iU8FX1Xs5/nKeQdesEFwoLnMmAVV7ECB8ImeIW3OFyjkDzFwpXhPvo X-Google-Smtp-Source: AGHT+IGVdAFraagwH4GxQ6mfGwewp+B+X4XJgSWCKhqpPPJRis9WYbVfWhuwHoGSdLlXyLxR2O4I3A== X-Received: by 2002:a17:906:3b0b:b0:a3d:8366:e1eb with SMTP id g11-20020a1709063b0b00b00a3d8366e1ebmr1532472ejf.31.1708006148358; Thu, 15 Feb 2024 06:09:08 -0800 (PST) Received: from toolbox.int.toradex.com (31-10-206-125.static.upc.ch. [31.10.206.125]) by smtp.gmail.com with ESMTPSA id p19-20020a170906b21300b00a3dad483948sm238238ejz.182.2024.02.15.06.09.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Feb 2024 06:09:08 -0800 (PST) From: max.oss.09@gmail.com To: openembedded-devel@lists.openembedded.org Cc: Max Krummenacher Subject: [meta-oe][PATCH 1/2] libusbgx: fix usbgx.service stop / restart Date: Thu, 15 Feb 2024 15:07:13 +0100 Message-ID: <20240215140714.2106808-1-max.oss.09@gmail.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 15 Feb 2024 14:09:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/108751 From: Max Krummenacher On start the usbgx service configures the usb gadget. However if one stops the service nothing is done, a subsequent start then tries to configure the gadget again and fails. `systemctl restart` is implemented by doing a stop followed by a start and thus is also affected. Doing a start/stop/start results with the following reported in status: | systemd[1]: Starting Load USB gadget schemas... | gadget-start[801]: usbg_create_gadget() duplicate gadget name | gadget-start[801]: | gadget-start[801]: Error on import gadget | gadget-start[801]: Error: USBG_ERROR_EXIST : Already exist | gadget-start[812]: ls: write error: Device or resource busy The run-postinsts service does execute a restart for each package which uses the systemd class which creates a race condition that the usbgx service is already started when run-postinsts restarts usbgx and creates the above error output. Fix that by unconfiguring the usb gadget on stop. Signed-off-by: Max Krummenacher --- .../recipes-support/libusbgx/libusbgx/gadget-stop | 13 +++++++++++++ .../recipes-support/libusbgx/libusbgx/usbgx.service | 2 ++ meta-oe/recipes-support/libusbgx/libusbgx_git.bb | 3 +++ 3 files changed, 18 insertions(+) create mode 100755 meta-oe/recipes-support/libusbgx/libusbgx/gadget-stop diff --git a/meta-oe/recipes-support/libusbgx/libusbgx/gadget-stop b/meta-oe/recipes-support/libusbgx/libusbgx/gadget-stop new file mode 100755 index 000000000..24b7caed5 --- /dev/null +++ b/meta-oe/recipes-support/libusbgx/libusbgx/gadget-stop @@ -0,0 +1,13 @@ +#!/bin/sh + +[ -r /etc/default/usbgx ] && . /etc/default/usbgx + +for i in $IMPORT_SCHEMAS; do + if [ -e /sys/kernel/config/usb_gadget/"$i"/idVendor ]; then + if [ -e /sys/kernel/config/usb_gadget/"$i"/idProduct ]; then + idVendor=$(cat /sys/kernel/config/usb_gadget/"$i"/idVendor) + idProduct=$(cat /sys/kernel/config/usb_gadget/"$i"/idProduct) + /usr/bin/gadget-vid-pid-remove ${idVendor}:${idProduct} + fi + fi +done diff --git a/meta-oe/recipes-support/libusbgx/libusbgx/usbgx.service b/meta-oe/recipes-support/libusbgx/libusbgx/usbgx.service index d7d394cfe..7210969d6 100644 --- a/meta-oe/recipes-support/libusbgx/libusbgx/usbgx.service +++ b/meta-oe/recipes-support/libusbgx/libusbgx/usbgx.service @@ -5,7 +5,9 @@ After=sys-kernel-config.mount [Service] Type=oneshot +RemainAfterExit=yes ExecStart=/usr/bin/gadget-start +ExecStop=/usr/bin/gadget-stop [Install] WantedBy=usb-gadget.target diff --git a/meta-oe/recipes-support/libusbgx/libusbgx_git.bb b/meta-oe/recipes-support/libusbgx/libusbgx_git.bb index f8ebcc776..484110561 100644 --- a/meta-oe/recipes-support/libusbgx/libusbgx_git.bb +++ b/meta-oe/recipes-support/libusbgx/libusbgx_git.bb @@ -13,6 +13,7 @@ SRC_URI = " \ file://0001-libusbgx-Add-interface-name-for-NCM-Feature-Descript.patch \ file://0001-fix-stack-buffer-overflow-in-usbg_f_foo_attr_val-pro.patch \ file://gadget-start \ + file://gadget-stop \ file://usbgx.initd \ file://usbgx.service \ " @@ -39,6 +40,8 @@ INHIBIT_UPDATERCD_BBCLASS = "${@bb.utils.contains('PACKAGECONFIG', 'examples', ' do_install:append() { install -Dm 0755 ${WORKDIR}/gadget-start ${D}${bindir}/gadget-start sed -i -e 's,/usr/bin,${bindir},g' -e 's,/etc,${sysconfdir},g' ${D}${bindir}/gadget-start + install -m 0755 ${WORKDIR}/gadget-start ${D}${bindir}/gadget-stop + sed -i -e 's,/usr/bin,${bindir},g' -e 's,/etc,${sysconfdir},g' ${D}${bindir}/gadget-stop if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -Dm 0644 ${WORKDIR}/usbgx.service ${D}${systemd_system_unitdir}/usbgx.service From patchwork Thu Feb 15 14:07:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Krummenacher X-Patchwork-Id: 39315 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7B71AC48BC4 for ; Thu, 15 Feb 2024 14:09:17 +0000 (UTC) Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com [209.85.218.52]) by mx.groups.io with SMTP id smtpd.web10.14470.1708006153151964111 for ; Thu, 15 Feb 2024 06:09:13 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=DVyf6mwE; spf=pass (domain: gmail.com, ip: 209.85.218.52, mailfrom: max.oss.09@gmail.com) Received: by mail-ej1-f52.google.com with SMTP id a640c23a62f3a-a2d7e2e7fe0so176282366b.1 for ; Thu, 15 Feb 2024 06:09:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708006151; x=1708610951; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5n6i7YN47kFMtx6YqQDoWjLLpqmfc2O0oEBI1k8UNHU=; b=DVyf6mwEhi+5/sHBVuo6fe+gfWOlopuEsVTLPebSfaNE5KM9ZYzgezMfJT5Xz9ykCr 8oySGVDyM0yvxabJXOlWmmP1AkbD8PVPQM06etNqan0Z+Da8acSko/Fct8jE3v438eTE d0xXflBChHtonYFBlWuwCRpbntMk/nLpRt1NeF3p3aUwQm22GYPglywIov8GP4CU+llT QLL/VPQJcV/prjqFMMlISe4MioL3Put5vlSCFgcVrEBjlt4k/zANkTGvuWgLE6wXwKUU L0zQmF1lLEWiv1x1pJfOt2/lU5tOXmRgXf/jv/5VjiSlLRznN6uCFnmXihLd8yiidXcX 4jaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708006151; x=1708610951; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5n6i7YN47kFMtx6YqQDoWjLLpqmfc2O0oEBI1k8UNHU=; b=fHQIV5CZlQsTRWbacK752tLgI6IV+Eo2jt4Q7yvhrte+bTXyuoPlVX/BqiYoIUGQZ6 s3xusLD7hB5+q/K0xO4iF056WWU5NEgnESYx9MkJjyIXBkzW5uV9yI9j7UN7kPx2wVUU nFLgv/DZibaBwW37cCsnsGYy5caJzebNuRRv3UHPze1TXH95X101FXjwWEi6VOwrDMVx 9qytP+Tc/7FO+rtkfyrJ88ZZYGVWge50eTfJpIudSrP7RpPUrJM646PEJHXUtHmdkENW GJHksRAWSGTX6VrJR5zuerZwxspYQbLS7X+mcI5ZI2tbqMuzE3Xdn8tbNMOtE7rIAIgF wtGw== X-Gm-Message-State: AOJu0Yzabz+msX5RJeCXfNoI4QuNB8jnXzzrGydysFDsW+fa3FDEzyZX 0OCQXw4DX5UjD4dF/Yg9cYvfroC0VI8xiEf2RyhtQTJGQnz5CkGpyGjUxVKW X-Google-Smtp-Source: AGHT+IFL8Ldat8Mt9FTdyVLHla3H6SSZ8wY83T/U8WNZfNNIr5G3riuu1xSNZgWIQpfQq8onB9uYOw== X-Received: by 2002:a17:906:ce2b:b0:a3c:1603:7bc6 with SMTP id sd11-20020a170906ce2b00b00a3c16037bc6mr3833819ejb.36.1708006151436; Thu, 15 Feb 2024 06:09:11 -0800 (PST) Received: from toolbox.int.toradex.com (31-10-206-125.static.upc.ch. [31.10.206.125]) by smtp.gmail.com with ESMTPSA id p19-20020a170906b21300b00a3dad483948sm238238ejz.182.2024.02.15.06.09.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Feb 2024 06:09:11 -0800 (PST) From: max.oss.09@gmail.com To: openembedded-devel@lists.openembedded.org Cc: Max Krummenacher Subject: [meta-oe][PATCH 2/2] libusbgx: uprev to the latest commit Date: Thu, 15 Feb 2024 15:07:14 +0100 Message-ID: <20240215140714.2106808-2-max.oss.09@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240215140714.2106808-1-max.oss.09@gmail.com> References: <20240215140714.2106808-1-max.oss.09@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 15 Feb 2024 14:09:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/108752 From: Max Krummenacher Uprev libusbgx to ec0b01c to get following fixes: ``` ec0b01c Merge pull request #83 from mgrzeschik/uac2-controls cbf1750 uac2: add additional configuration controls 81d7c05 load libcomposite kernel module caad244 Fix: Memory leak config label 51abbfd Automake: fix distclean of tests 3cc5af7 Added printer function header to installed headers adc45af Added missing extern C closing brace ``` Refresh 0001-fix-stack-buffer-overflow-in-usbg_f_foo_attr_val-pro.patch. Signed-off-by: Max Krummenacher --- meta-oe/recipes-support/libusbgx/libusbgx_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/libusbgx/libusbgx_git.bb b/meta-oe/recipes-support/libusbgx/libusbgx_git.bb index 484110561..a20ff4eea 100644 --- a/meta-oe/recipes-support/libusbgx/libusbgx_git.bb +++ b/meta-oe/recipes-support/libusbgx/libusbgx_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ inherit autotools pkgconfig systemd update-rc.d update-alternatives PV = "0.2.0+git" -SRCREV = "721e3a1cbd7e2b6361bb439d3959e7403e4f0092" +SRCREV = "ec0b01c03fdc7893997b7b32ec1c12c6103f62f3" SRCBRANCH = "master" SRC_URI = " \ git://github.com/libusbgx/libusbgx.git;branch=${SRCBRANCH};protocol=https \