From patchwork Thu Feb 18 03:20:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Marek X-Patchwork-Id: 12092891 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.9 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A308EC433E9 for ; Thu, 18 Feb 2021 03:23:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7481264E45 for ; Thu, 18 Feb 2021 03:23:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230087AbhBRDWz (ORCPT ); Wed, 17 Feb 2021 22:22:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44794 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229885AbhBRDWt (ORCPT ); Wed, 17 Feb 2021 22:22:49 -0500 Received: from mail-qk1-x735.google.com (mail-qk1-x735.google.com [IPv6:2607:f8b0:4864:20::735]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5B269C06178C for ; Wed, 17 Feb 2021 19:21:56 -0800 (PST) Received: by mail-qk1-x735.google.com with SMTP id f17so902726qkl.5 for ; Wed, 17 Feb 2021 19:21:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marek-ca.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CB9XXZYfCi92ZZqhIlrCBfKt5Eaz4xz7mSDsgtik5fw=; b=wl5Zo2Z1d3OkD2LnENDJgjZdiSWnw1Iz/Kv2CM1ReP7bjhwUINKTjRQwwXQPrusDIJ zuxizfG4SSYlDJQ31m/GRZRJKPRISiyrkxpcSW93kx7SuXbKaOGOxIcKx2Aj9Z8pRKA2 /GMWSe7GYo09avXQZKThhcMyRSFHYzLZeStbP7luO0NxPUMsfDK/MLe7TkplCDRqM8GX d2KGWyULWVsgDbDd6leaubhx5cZhNvpNsOenox5jRDuiF7nn7BdvWEctnvhINUT/YhPu hhm//p09JNh9iI+up8x1qZrcr/0BZTWmofEuYPpLQBLL38EluyrGWebFD+6I7sZD5LLV 81/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CB9XXZYfCi92ZZqhIlrCBfKt5Eaz4xz7mSDsgtik5fw=; b=DPO8zpkTAu2eOtOPetRr9kKzAKqNOm7xxREXF4AA8K1iR3E+VYYV67iyA4J0JN9z/1 cNzzxuTv0yk0OD5EgLaOB89yfEbW/LOZyly8fLD8TiweSt+j1+nqEwOYqGg9mf6swFaK P9le/Yf6LwJKDigaDZ/B5kNxR5FceSFA18Ru82tXxGqmCZGhXTDQCW0ECQUkr2T3SSmQ bvwuP6md11l++/901col6GWZKj7I25T+hZg/n1JsqzRMRxel+EHihD9RYUzSQ29kCYL2 z6EspMNr5/YB8ZaTIjqlMorfDBPOwhMADJveZ0ZVfrU9jaIXaAax5vJnWfVQGGPgcozP M/+Q== X-Gm-Message-State: AOAM531acOfpBByLXcPpNSlCTY6vHXacE6+n/YrO2enaSfRsG6ShmKKQ l5jhq1ME5V8kwGBvhieXB+ykLGfR8J0SC06w X-Google-Smtp-Source: ABdhPJx0LPGJmVHgO0DEiZ5v+XPXXIsMGh5EN6oDPK4U/NqcLiiq1wtHxay96Bxkz+EMcZoTqF91Lg== X-Received: by 2002:a37:a004:: with SMTP id j4mr2460502qke.450.1613618515303; Wed, 17 Feb 2021 19:21:55 -0800 (PST) Received: from localhost.localdomain (modemcable068.184-131-66.mc.videotron.ca. [66.131.184.68]) by smtp.gmail.com with ESMTPSA id b24sm2578996qtt.44.2021.02.17.19.21.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Feb 2021 19:21:54 -0800 (PST) From: Jonathan Marek To: linux-arm-msm@vger.kernel.org Cc: srinivas.kandagatla@linaro.org, Arnd Bergmann , Greg Kroah-Hartman , linux-kernel@vger.kernel.org (open list) Subject: [PATCH 1/3] fastrpc: always use fl->lock and remove fl->mutex Date: Wed, 17 Feb 2021 22:20:53 -0500 Message-Id: <20210218032055.28247-2-jonathan@marek.ca> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20210218032055.28247-1-jonathan@marek.ca> References: <20210218032055.28247-1-jonathan@marek.ca> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Fix the broken behavior of having a separate mutex for locking at this place, and use the same spinlock that is used to add/remove from the list. Signed-off-by: Jonathan Marek --- drivers/misc/fastrpc.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/misc/fastrpc.c b/drivers/misc/fastrpc.c index f12e909034ac..4fabea0c1551 100644 --- a/drivers/misc/fastrpc.c +++ b/drivers/misc/fastrpc.c @@ -230,8 +230,6 @@ struct fastrpc_user { int pd; /* Lock for lists */ spinlock_t lock; - /* lock for allocations */ - struct mutex mutex; }; static void fastrpc_free_map(struct kref *ref) @@ -267,16 +265,16 @@ static int fastrpc_map_find(struct fastrpc_user *fl, int fd, { struct fastrpc_map *map = NULL; - mutex_lock(&fl->mutex); + spin_lock(&fl->lock); list_for_each_entry(map, &fl->maps, node) { if (map->fd == fd) { fastrpc_map_get(map); *ppmap = map; - mutex_unlock(&fl->mutex); + spin_unlock(&fl->lock); return 0; } } - mutex_unlock(&fl->mutex); + spin_unlock(&fl->lock); return -ENOENT; } @@ -1200,7 +1198,6 @@ static int fastrpc_device_release(struct inode *inode, struct file *file) fastrpc_session_free(cctx, fl->sctx); fastrpc_channel_ctx_put(cctx); - mutex_destroy(&fl->mutex); kfree(fl); file->private_data = NULL; @@ -1222,7 +1219,6 @@ static int fastrpc_device_open(struct inode *inode, struct file *filp) filp->private_data = fl; spin_lock_init(&fl->lock); - mutex_init(&fl->mutex); INIT_LIST_HEAD(&fl->pending); INIT_LIST_HEAD(&fl->maps); INIT_LIST_HEAD(&fl->mmaps); @@ -1233,7 +1229,6 @@ static int fastrpc_device_open(struct inode *inode, struct file *filp) fl->sctx = fastrpc_session_alloc(cctx); if (!fl->sctx) { dev_err(&cctx->rpdev->dev, "No session available\n"); - mutex_destroy(&fl->mutex); kfree(fl); return -EBUSY;