From mboxrd@z Thu Jan 1 00:00:00 1970 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0BFAFC5321E for ; Sun, 25 Aug 2024 13:14:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: Content-Type:In-Reply-To:From:References:Cc:To:Subject:MIME-Version:Date: Message-ID:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=BjT76MGllL0Qcry+tUV4L4dLGaCMJhJzvO4cnqx+Y6g=; b=uGn+1icBNUwRWpdhGsr44jMQs5 +915kIPy4ZNc7UpQIcoAomDu4llzfsHC/S5KU/XcLg4smZCv0Mnl/14nB/2gdNkX7cZh5CqzHOK6O v1Q8f+znwGBzNPaZMEX3sXOLAdtZNgwE8L86m954fgGw/nwou9I3yujdhlS801qP0LHmOugt3vS1f PwYlrWOAfYXwiRP2Yd1lTy2R3CcyXn8coCHmR31sdXNJA0qYPjvJbmVREpO0EFH+XziilWuIWaaet uLwdp3xDbwVIgQzvzBWD5kiAsTBILmYuw6e3xBhPbTr3QFD5RHPAc4tuLajJW5tbtHhNWUlQ0a9RE +pkAdaqg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1siD43-00000004N8y-2PTQ; Sun, 25 Aug 2024 13:13:51 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1siD3H-00000004N2O-1OXz for linux-arm-kernel@lists.infradead.org; Sun, 25 Aug 2024 13:13:04 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724591582; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BjT76MGllL0Qcry+tUV4L4dLGaCMJhJzvO4cnqx+Y6g=; b=h00MT5OzNb4u65ogvNRayx2QATnT6PEUgQpQCbTM6r8iBhjwqnGuPSwcQ4RdcbVtkm56Ut AfnrHCHUVjM3pAMptOqkMEaPK6F6H9ng1TawJMszmsEOswFoIzeVoJeZXDbI3avfwEMPnU cwRuoYhutfvzcC8WmRm3xx+MqBD6jbA= Received: from mail-lj1-f198.google.com (mail-lj1-f198.google.com [209.85.208.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-99--KyssbOTOKmwJJ-o5DKrIA-1; Sun, 25 Aug 2024 09:13:00 -0400 X-MC-Unique: -KyssbOTOKmwJJ-o5DKrIA-1 Received: by mail-lj1-f198.google.com with SMTP id 38308e7fff4ca-2f4062343deso29330861fa.1 for ; Sun, 25 Aug 2024 06:13:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724591579; x=1725196379; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=BjT76MGllL0Qcry+tUV4L4dLGaCMJhJzvO4cnqx+Y6g=; b=jT+id78yvmAmUZ3hC/wCoQjEhx0wxSiO7Y+Xm91M6/nmk1X1RDDluZBQfj1E+MUjRm tflSmwxaE9icvIpVTxigEViyLF8t7kSc949WbiH8R+orBIq0lW+bKTGAZFoeg7mqxpYk FEMqTxvHooC4zPKqTkBi5V5vw45Jhuec/xrdZ+jmbci7aWSpgdYbMVa133of0puSjIR9 RpWHssubTrLucX0lyTScriEjKv87z5/7CI4ksCGAKdm3VJBQJnmgJjxB3jAOd/G4zHIe 4Z9FcBLFPizVctX6IiJDoylL98x0HOv5I053+mFgA3LT+ZjAiN0qr+gNCHrR1heXW1Di h7Ww== X-Forwarded-Encrypted: i=1; AJvYcCXAULHaOD4VMPpkshn/RlCCfB9KUyf3dNkuPlvnCi2qNFB7UpCO8c46rk2AAevcAFnK0TpC/Qgd8JMNpPp9c8XS@lists.infradead.org X-Gm-Message-State: AOJu0YyNr2hXpQ9DjANoncIBtWoKk6IPSAHvmKZruJDWSZa28UUA7JsY +IIIWVHovL3+ZA4k7Ac96Y2MAft4udOQISDlvxD/7yj9xI7gYnhkXZSUGQdFNpR4qu9WLVsF0Bk hpt5nWR1zNsXolRfxAP2Ql4qSvaRnMZ9oP6UcLJcC2/RJCaoljwH4yYq7NWCqh3nDrbt0VLQf X-Received: by 2002:a2e:5119:0:b0:2f1:922f:874a with SMTP id 38308e7fff4ca-2f4f48eeda8mr42665911fa.14.1724591579161; Sun, 25 Aug 2024 06:12:59 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFGedG8Qc1ocP0F7rBDO7Du9zOdeBSFMEWGKGSF2JNS3V7HesaJGbrGKKVPU6aQQc17mUbUsw== X-Received: by 2002:a2e:5119:0:b0:2f1:922f:874a with SMTP id 38308e7fff4ca-2f4f48eeda8mr42665631fa.14.1724591578503; Sun, 25 Aug 2024 06:12:58 -0700 (PDT) Received: from ?IPV6:2001:1c00:c32:7800:5bfa:a036:83f0:f9ec? (2001-1c00-0c32-7800-5bfa-a036-83f0-f9ec.cable.dynamic.v6.ziggo.nl. [2001:1c00:c32:7800:5bfa:a036:83f0:f9ec]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5c04a3cc25bsm4404438a12.38.2024.08.25.06.12.57 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 25 Aug 2024 06:12:58 -0700 (PDT) Message-ID: Date: Sun, 25 Aug 2024 15:12:57 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 03/17] Input: atkbd - use guard notation when acquiring mutex To: Dmitry Torokhov , linux-input@vger.kernel.org Cc: Michael Hennerich , Shawn Guo , Sascha Hauer , Fabio Estevam , Laxman Dewangan , Thierry Reding , Tony Lindgren , Jeff LaBundy , linux-kernel@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-tegra@vger.kernel.org References: <20240825051627.2848495-1-dmitry.torokhov@gmail.com> <20240825051627.2848495-4-dmitry.torokhov@gmail.com> From: Hans de Goede In-Reply-To: <20240825051627.2848495-4-dmitry.torokhov@gmail.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US, nl Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240825_061303_484394_0BFE3955 X-CRM114-Status: GOOD ( 19.32 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi, On 8/25/24 7:16 AM, Dmitry Torokhov wrote: > This makes the code more compact and error handling more robust > by ensuring that mutexes are released in all code paths when control > leaves critical section. > > Signed-off-by: Dmitry Torokhov Thanks, patch looks good to me: Reviewed-by: Hans de Goede Regards, Hans > --- > drivers/input/keyboard/atkbd.c | 37 ++++++++++++++-------------------- > 1 file changed, 15 insertions(+), 22 deletions(-) > > diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c > index f4f2078cf501..5855d4fc6e6a 100644 > --- a/drivers/input/keyboard/atkbd.c > +++ b/drivers/input/keyboard/atkbd.c > @@ -639,7 +639,7 @@ static void atkbd_event_work(struct work_struct *work) > { > struct atkbd *atkbd = container_of(work, struct atkbd, event_work.work); > > - mutex_lock(&atkbd->mutex); > + guard(mutex)(&atkbd->mutex); > > if (!atkbd->enabled) { > /* > @@ -657,8 +657,6 @@ static void atkbd_event_work(struct work_struct *work) > if (test_and_clear_bit(ATKBD_REP_EVENT_BIT, &atkbd->event_mask)) > atkbd_set_repeat_rate(atkbd); > } > - > - mutex_unlock(&atkbd->mutex); > } > > /* > @@ -1361,7 +1359,7 @@ static int atkbd_reconnect(struct serio *serio) > { > struct atkbd *atkbd = atkbd_from_serio(serio); > struct serio_driver *drv = serio->drv; > - int retval = -1; > + int error; > > if (!atkbd || !drv) { > dev_dbg(&serio->dev, > @@ -1369,16 +1367,17 @@ static int atkbd_reconnect(struct serio *serio) > return -1; > } > > - mutex_lock(&atkbd->mutex); > + guard(mutex)(&atkbd->mutex); > > atkbd_disable(atkbd); > > if (atkbd->write) { > - if (atkbd_probe(atkbd)) > - goto out; > + error = atkbd_probe(atkbd); > + if (error) > + return error; > > if (atkbd->set != atkbd_select_set(atkbd, atkbd->set, atkbd->extra)) > - goto out; > + return -EIO; > > /* > * Restore LED state and repeat rate. While input core > @@ -1404,11 +1403,7 @@ static int atkbd_reconnect(struct serio *serio) > if (atkbd->write) > atkbd_activate(atkbd); > > - retval = 0; > - > - out: > - mutex_unlock(&atkbd->mutex); > - return retval; > + return 0; > } > > static const struct serio_device_id atkbd_serio_ids[] = { > @@ -1465,17 +1460,15 @@ static ssize_t atkbd_attr_set_helper(struct device *dev, const char *buf, size_t > struct atkbd *atkbd = atkbd_from_serio(serio); > int retval; > > - retval = mutex_lock_interruptible(&atkbd->mutex); > - if (retval) > - return retval; > + scoped_guard(mutex_intr, &atkbd->mutex) { > + atkbd_disable(atkbd); > + retval = handler(atkbd, buf, count); > + atkbd_enable(atkbd); > > - atkbd_disable(atkbd); > - retval = handler(atkbd, buf, count); > - atkbd_enable(atkbd); > - > - mutex_unlock(&atkbd->mutex); > + return retval; > + } > > - return retval; > + return -EINTR; > } > > static ssize_t atkbd_show_extra(struct atkbd *atkbd, char *buf)