From patchwork Thu Jun 22 16:52:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: stsp X-Patchwork-Id: 111772 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp5208510vqr; Thu, 22 Jun 2023 09:58:17 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5EhsfvbkIRvnLb1SUjbVW5AejtNpyyhLbB/FGXatlcNXdqDSM9oo5r76025wvo5+9vv9Py X-Received: by 2002:a17:903:188:b0:1b2:4b28:793c with SMTP id z8-20020a170903018800b001b24b28793cmr23484918plg.29.1687453097048; Thu, 22 Jun 2023 09:58:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687453097; cv=none; d=google.com; s=arc-20160816; b=gdd3whYxk1BUPNnk6sq7I2Oax61rhDMDQdjONv43fHOw7NZAutEcyXJOu/tYvAoSIw pEl4HR8v1GdeRDJMmoqOziC1Xoh+Be6L6j02n9hQXC/I9EVRbKRLuwKp86wdKy1gOBC1 klfl7SePDi3lARg6wqIxOIho88E/60vqqg1uCkozYgc2D5rlVNPIiSu19lKHdUxJVTp+ uH7VM/zB23HagcsOXT63kYCBBcCU2cBSjHXWU6bC9gwC1riqLcWVq2awnpkiY9uVhR5Z 0ENly5vwigH/U+XeRkQ4LKEiWfeEOiXtY2VJRRcrzL/oz2Fc2Vj00JVmLhVyZ/46VDJK 61HQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=lDc4QgnEZC8KLbodk8+haNOeCOpk4ZEgKr8+epbYZ8s=; b=sV2COV/DSkyI+u33YduqZuXO0/m7P/lhjUXo/UhHBEcmkmFh6in09hjx7V8vF0TcUI gC7sPBSfrtDvhhD4FTk3MasXiwn8lkeqSptzfh+3JQNXJVyEs2nghgWcSkNrkw+R0kwT Fp7IpkoT3gK3iwRlp2d+M6+sZEr5AdsBdWsK0SwxTcPdlNgJ5YAHicKSyRhddsVRA/v0 L2ctZXOLWMXTuE/rc+bEvPzEZezQms8uHA7M/3xQ7SGEFSLOTYz+gnMc1jiUjT6aR6gg L7cjBfeiyG+HVi252jkEZW48/6HoyYeO3UQP0aGj/Qv6nKuwlR478xlP27auMnx0JauW l8Gw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@yandex.ru header.s=mail header.b="d9Au/G7f"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i7-20020a1709026ac700b001b3f4c8f6c1si2954900plt.43.2023.06.22.09.58.04; Thu, 22 Jun 2023 09:58:17 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@yandex.ru header.s=mail header.b="d9Au/G7f"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231468AbjFVQxD (ORCPT + 99 others); Thu, 22 Jun 2023 12:53:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41594 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231452AbjFVQw5 (ORCPT ); Thu, 22 Jun 2023 12:52:57 -0400 Received: from forward100b.mail.yandex.net (forward100b.mail.yandex.net [IPv6:2a02:6b8:c02:900:1:45:d181:d100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 315E3E9; Thu, 22 Jun 2023 09:52:56 -0700 (PDT) Received: from mail-nwsmtp-smtp-production-main-39.sas.yp-c.yandex.net (mail-nwsmtp-smtp-production-main-39.sas.yp-c.yandex.net [IPv6:2a02:6b8:c08:2087:0:640:7bf5:0]) by forward100b.mail.yandex.net (Yandex) with ESMTP id C36E260033; Thu, 22 Jun 2023 19:52:53 +0300 (MSK) Received: by mail-nwsmtp-smtp-production-main-39.sas.yp-c.yandex.net (smtp/Yandex) with ESMTPSA id kqJAlpLDeKo0-UlNqGWkF; Thu, 22 Jun 2023 19:52:52 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1687452773; bh=lDc4QgnEZC8KLbodk8+haNOeCOpk4ZEgKr8+epbYZ8s=; h=Message-Id:Date:In-Reply-To:Cc:Subject:References:To:From; b=d9Au/G7fw+hAU9H5dZU/hkKz5vWdRoEwQneYwbVnEdlhySD0bmjL8cS3N2dIoo7W8 kIUlD3aj4do/0LS1Ql7uhIazcXHmVSNytAukyzOWPttEbmAUxcBTWglqY/ctW6H3wg VE5qx/nyLn688d2XfqOMjKhKHZj3HCwlgluWs6Qc= Authentication-Results: mail-nwsmtp-smtp-production-main-39.sas.yp-c.yandex.net; dkim=pass header.i=@yandex.ru From: Stas Sergeev To: linux-kernel@vger.kernel.org Cc: Stas Sergeev , Jeff Layton , Chuck Lever , Alexander Viro , Christian Brauner , linux-fsdevel@vger.kernel.org, Shuah Khan , linux-kselftest@vger.kernel.org, linux-api@vger.kernel.org Subject: [PATCH 1/2] fs/locks: F_UNLCK extension for F_OFD_GETLK Date: Thu, 22 Jun 2023 21:52:23 +0500 Message-Id: <20230622165225.2772076-2-stsp2@yandex.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230622165225.2772076-1-stsp2@yandex.ru> References: <20230622165225.2772076-1-stsp2@yandex.ru> MIME-Version: 1.0 X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769422818981849853?= X-GMAIL-MSGID: =?utf-8?q?1769422818981849853?= Currently F_UNLCK with F_OFD_GETLK returns -EINVAL. The proposed extension allows to use it for getting the lock information from the particular fd. Signed-off-by: Stas Sergeev CC: Jeff Layton CC: Chuck Lever CC: Alexander Viro CC: Christian Brauner CC: linux-fsdevel@vger.kernel.org CC: linux-kernel@vger.kernel.org CC: Shuah Khan CC: linux-kselftest@vger.kernel.org CC: linux-api@vger.kernel.org --- fs/locks.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/fs/locks.c b/fs/locks.c index df8b26a42524..210766007e63 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -868,6 +868,21 @@ static bool posix_locks_conflict(struct file_lock *caller_fl, return locks_conflict(caller_fl, sys_fl); } +/* Determine if lock sys_fl blocks lock caller_fl. Used on xx_GETLK + * path so checks for additional GETLK-specific things like F_UNLCK. + */ +static bool posix_test_locks_conflict(struct file_lock *caller_fl, + struct file_lock *sys_fl) +{ + /* F_UNLCK checks any locks on the same fd. */ + if (caller_fl->fl_type == F_UNLCK) { + if (!posix_same_owner(caller_fl, sys_fl)) + return false; + return locks_overlap(caller_fl, sys_fl); + } + return posix_locks_conflict(caller_fl, sys_fl); +} + /* Determine if lock sys_fl blocks lock caller_fl. FLOCK specific * checking before calling the locks_conflict(). */ @@ -901,7 +916,7 @@ posix_test_lock(struct file *filp, struct file_lock *fl) retry: spin_lock(&ctx->flc_lock); list_for_each_entry(cfl, &ctx->flc_posix, fl_list) { - if (!posix_locks_conflict(fl, cfl)) + if (!posix_test_locks_conflict(fl, cfl)) continue; if (cfl->fl_lmops && cfl->fl_lmops->lm_lock_expirable && (*cfl->fl_lmops->lm_lock_expirable)(cfl)) { @@ -2207,7 +2222,8 @@ int fcntl_getlk(struct file *filp, unsigned int cmd, struct flock *flock) if (fl == NULL) return -ENOMEM; error = -EINVAL; - if (flock->l_type != F_RDLCK && flock->l_type != F_WRLCK) + if (cmd != F_OFD_GETLK && flock->l_type != F_RDLCK + && flock->l_type != F_WRLCK) goto out; error = flock_to_posix_lock(filp, fl, flock); @@ -2414,7 +2430,8 @@ int fcntl_getlk64(struct file *filp, unsigned int cmd, struct flock64 *flock) return -ENOMEM; error = -EINVAL; - if (flock->l_type != F_RDLCK && flock->l_type != F_WRLCK) + if (cmd != F_OFD_GETLK && flock->l_type != F_RDLCK + && flock->l_type != F_WRLCK) goto out; error = flock64_to_posix_lock(filp, fl, flock);