From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 348C613E88B for ; Sun, 25 Aug 2024 13:13:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724591585; cv=none; b=EK7vuBy3PtvJKD3CFE844JnhfgMg1KDYD9RQFuXjOsPED7emopMFbbCxRME+vYE8Hx1bhMpjexr/FjGFIqkQ5E08gZbnaXPv0G2CLfVzFQpE15xtHxto7WfzheGAMVp8sa5Z/m7kc9Y7rpE1txl5IfYtzfnzbg609oe54w3vlWA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724591585; c=relaxed/simple; bh=TgKYnPZPyDTOZ3L65cfrHkuK/skuYvE26k2QLr8XRJ4=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=SMS1/xrv3uaiXssP1aiS6vTHaITHkpswXoGknoia0fKfY1df7OpRd2Vjh8aUgtOfTi/5GQ9tMrGRqvqfNpWVroWlu1MJcjjQTn5TQmLqsu3yqx/Bb56Az2H4KaKwxNbUSwUNESTC6tQz0pParR8xVH5m4i0fYvaBc/FOAVV8cSw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=M2Ha1XfY; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="M2Ha1XfY" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724591583; 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=M2Ha1XfYZMKativ1+EOZh2gWVWX2zXCA8PZyO5mx2ndaOaUjviI1/2Xgy0w8SCcJ26CJk6 P+WSf81mvPvbXT05T9bXpZBHssUo2SFlyVg6MOHodlJw15qyEMfDTWQiK19cJ3qOmV9iX2 r+zhG0bX2jAejrFKB7yF4HVimSELvFA= 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-1-bHRZF9cwNbKrjvnTvqyB7Q-1; Sun, 25 Aug 2024 09:13:00 -0400 X-MC-Unique: bHRZF9cwNbKrjvnTvqyB7Q-1 Received: by mail-lj1-f198.google.com with SMTP id 38308e7fff4ca-2f4051c38b7so35175331fa.0 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=KC5i4ufaXfH97fOigvV8XiykyW+52C+qsywa2oQIE98rm+qDfVgUCQJzyyoUo+a40G Amiy5r66VU6rgltmEz1SpKgbJeXV7dARV9oPTjpkCZVCZ7/bZOVK1OD0o/GTFj0thkpv ytLPNvNeD7hGCzxTH1qiRlygkbq6jwtjZuLK4EZdxV17yjelmnupMmMwlneG8V+Hq9lN G3HxynyhixDIn4eydnzam+ERhMP/fh/lrobcqNQ3OZiWE84f7/rCwkRn9x2ED5pXvgLi gsjjVs19ZFow1Ah8hny4j2XSktthywfV2GofXQVrAiUCIbYuKmy3sWo/Id6s0gXpN1Zu LOmg== X-Forwarded-Encrypted: i=1; AJvYcCVpKZdwStGroDo3znKCZetgGxnmvqbD0yVJVBBb0BrMHcm5EEH/MzBcuy3VsUS5gDfKFeGk95VVC5qs2w==@vger.kernel.org X-Gm-Message-State: AOJu0YxosQWdWDKytU1uOPL3/4EX1Z8txJkl+2K38xLB4W5DCj51Qpyi oFZGwBjOpjXcZQwgzTt95/F548gf+HekOu/6HPN8DhfvoF2fLcAsinNKtW+LtiP//P/4JANeHr0 R/Yr2IzQX4ld8DtwbjNt62hYqxQ7qJbOOBAdRxBr8Xrs9bNZwOIPgPnRCmUEf X-Received: by 2002:a2e:5119:0:b0:2f1:922f:874a with SMTP id 38308e7fff4ca-2f4f48eeda8mr42665861fa.14.1724591579160; 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 Precedence: bulk X-Mailing-List: linux-input@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: 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> Content-Language: en-US, nl From: Hans de Goede In-Reply-To: <20240825051627.2848495-4-dmitry.torokhov@gmail.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit 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)