From patchwork Sat Dec 24 16:34:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak R Varma X-Patchwork-Id: 636665 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 16886C4332F for ; Sat, 24 Dec 2022 16:34:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230247AbiLXQen (ORCPT ); Sat, 24 Dec 2022 11:34:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50694 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229688AbiLXQem (ORCPT ); Sat, 24 Dec 2022 11:34:42 -0500 Received: from msg-2.mailo.com (msg-2.mailo.com [213.182.54.12]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 72BF6BC24; Sat, 24 Dec 2022 08:34:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1671899673; bh=JOlABxyXfYqHNmeXEA2u7PKdxsmIADwnMI+IIPAofYs=; h=X-EA-Auth:Date:From:To:Cc:Subject:Message-ID:References: MIME-Version:Content-Type:In-Reply-To; b=G7fRU4wGfAc6gzasYNgExIne6OeHxLd2yQwgYqH9UVM9hGaioJ7GT+snkxYaZHzmF T9rz25g8S5NVnzAC5x63nQIRo7d0WY5dNkAVSHrJJct00oswLDiQ/RkyEtlq3STeTa A/YzBd4wTuc4D//7kxpGMBaj/TN4pLeXbOQkf9ns= Received: by b-4.in.mailobj.net [192.168.90.14] with ESMTP via ip-206.mailobj.net [213.182.55.206] Sat, 24 Dec 2022 17:34:33 +0100 (CET) X-EA-Auth: u5gVJF6h2z6ranrprLxW6HFUwyiomyX6r//ovjc1j/VosSoEw1Ak2Lw/JbyumNnUO9AM56Ey8DrPTbNA0EQfj9lOo+WcqNpx Date: Sat, 24 Dec 2022 22:04:28 +0530 From: Deepak R Varma To: "Maciej W. Rozycki" , Greg Kroah-Hartman , Jiri Slaby , linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Saurabh Singh Sengar , Praveen Kumar , Deepak R Varma Subject: [PATCH 2/2] tty: serial: dz: convert atomic_* to refcount_* APIs for irq_guard Message-ID: <51ef854f77779c82010379420139993e12c38776.1671898144.git.drv@mailo.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-serial@vger.kernel.org The refcount_* APIs are designed to address known issues with the atomic_t APIs for reference counting. They provide following distinct advantages: - protect the reference counters from overflow/underflow - avoid use-after-free errors - provide improved memory ordering guarantee schemes - neater and safer. Hence, replace the atomic_* APIs by their equivalent refcount_t API functions. This patch proposal address the following warnings generated by the atomic_as_refcounter.cocci coccinelle script atomic_add_return(-1, ...) Signed-off-by: Deepak R Varma --- Please Note: 1. The patch is compile tested using dec_station.defconfig for MIPS architecture. 2. This patch should be applied after patch 1/2 of this series due to dependency. Changes in v3: 1. Include the individual patches in a series and highlight dependency. Feedback provided by gregkh@linuxfoundation.org Changes in v2: 1. Separate the combined change into one variable per patch as suggested by gregkh@linuxfoundation.org drivers/tty/serial/dz.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) -- 2.34.1 diff --git a/drivers/tty/serial/dz.c b/drivers/tty/serial/dz.c index b70edc248f8b..0aa59a9beeb7 100644 --- a/drivers/tty/serial/dz.c +++ b/drivers/tty/serial/dz.c @@ -46,7 +46,6 @@ #include #include -#include #include #include #include @@ -77,7 +76,7 @@ struct dz_port { struct dz_mux { struct dz_port dport[DZ_NB_PORT]; refcount_t map_guard; - atomic_t irq_guard; + refcount_t irq_guard; int initialised; }; @@ -400,18 +399,16 @@ static int dz_startup(struct uart_port *uport) struct dz_port *dport = to_dport(uport); struct dz_mux *mux = dport->mux; unsigned long flags; - int irq_guard; int ret; u16 tmp; - irq_guard = atomic_add_return(1, &mux->irq_guard); - if (irq_guard != 1) + refcount_inc(&mux->irq_guard); + if (refcount_read(&mux->irq_guard) != 1) return 0; - ret = request_irq(dport->port.irq, dz_interrupt, - IRQF_SHARED, "dz", mux); + ret = request_irq(dport->port.irq, dz_interrupt, IRQF_SHARED, "dz", mux); if (ret) { - atomic_add(-1, &mux->irq_guard); + refcount_dec(&mux->irq_guard); printk(KERN_ERR "dz: Cannot get IRQ %d!\n", dport->port.irq); return ret; } @@ -441,15 +438,13 @@ static void dz_shutdown(struct uart_port *uport) struct dz_port *dport = to_dport(uport); struct dz_mux *mux = dport->mux; unsigned long flags; - int irq_guard; u16 tmp; spin_lock_irqsave(&dport->port.lock, flags); dz_stop_tx(&dport->port); spin_unlock_irqrestore(&dport->port.lock, flags); - irq_guard = atomic_add_return(-1, &mux->irq_guard); - if (!irq_guard) { + if (refcount_dec_and_test(&mux->irq_guard)) { /* Disable interrupts. */ tmp = dz_in(dport, DZ_CSR); tmp &= ~(DZ_RIE | DZ_TIE);