From patchwork Wed Jun 21 15:22:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: stsp X-Patchwork-Id: 111127 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp4458347vqr; Wed, 21 Jun 2023 08:43:30 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5LSKYYV3FjFLHUvmYKJiRbW+zVPqaCxN57tF+zcfuXmW+HjAEC+3i9/nnyRLqFT4XLI4GL X-Received: by 2002:a05:6808:1512:b0:39e:c660:a5ff with SMTP id u18-20020a056808151200b0039ec660a5ffmr8608396oiw.12.1687362210309; Wed, 21 Jun 2023 08:43:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687362210; cv=none; d=google.com; s=arc-20160816; b=U1dCfzfxOc0k9EPV4ITs8XO0VsFLK+ujJmKOI7EgvqLxMunNrbaKQ9paIfzAHnVpxl w0NPGyd9s5miEy6VXeHbe35jBek3jILt1uFkH7WmgADhcEHhxIDTvB6Odyu4dHTPLxRG FqjrqLYXgLpM6r3pDVBXbkFgfKhH5qsEP9J7KDzqeWGMJ2RiHtunNthrSb8C2M7ZOIAH TJ48vQFlIx4MfloHNXJlIm7ixkHy64CoZTpFBVNBKD5M7E6riE3+XBxkrU5z9cOth5sM 7hobzKY7yqw3YdmYy/vUHWVaopYYq39IWtkpmLMP/8hxtvpU/5BMT1WHhbIqbA3MpN7T cigQ== 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=BeFllrKJs9ZbfJrErNdB8AXTfSxQUYBe3aDsecmcQosJvEskcnFe/1QQevM06B+ye2 bpaq0F0tyUyefbps3YKVRL2vtSCUIhkzfZkg2kNv/8+TpsErcOwPtFphIo5a86TMHt62 u7bjh8+nbfHbDh1HeC0Bjph4ID3QEiZWM9TDCNXOrbgvfXfaOKVe+57Jlsj0GtKJJVFK h3VA0KOxp5GlFWTu3/m7u2F8PdhEXR8tDAQBtnKgo5opIwJDwll+mNHoYWsjGbg+Q4da nF5hvBHH0ZJ20WyZ0t711wXbUrlP2Nk4l+GyY2Bdp4XwMtbGxxmMYbpM9acgYtpLr6z7 E5zQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@yandex.ru header.s=mail header.b="eIQxgQ/K"; 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 j190-20020a638bc7000000b00553b02a9a18si4362827pge.237.2023.06.21.08.43.16; Wed, 21 Jun 2023 08:43:30 -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="eIQxgQ/K"; 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 S233488AbjFUPbo (ORCPT + 99 others); Wed, 21 Jun 2023 11:31:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38308 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233462AbjFUPba (ORCPT ); Wed, 21 Jun 2023 11:31:30 -0400 Received: from forward206a.mail.yandex.net (forward206a.mail.yandex.net [178.154.239.87]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CBADDCC; Wed, 21 Jun 2023 08:30:57 -0700 (PDT) Received: from forward103a.mail.yandex.net (forward103a.mail.yandex.net [IPv6:2a02:6b8:c0e:500:1:45:d181:d103]) by forward206a.mail.yandex.net (Yandex) with ESMTP id E496247332; Wed, 21 Jun 2023 18:22:46 +0300 (MSK) Received: from mail-nwsmtp-smtp-production-main-31.vla.yp-c.yandex.net (mail-nwsmtp-smtp-production-main-31.vla.yp-c.yandex.net [IPv6:2a02:6b8:c18:58f:0:640:3768:0]) by forward103a.mail.yandex.net (Yandex) with ESMTP id 7231846C65; Wed, 21 Jun 2023 18:22:42 +0300 (MSK) Received: by mail-nwsmtp-smtp-production-main-31.vla.yp-c.yandex.net (smtp/Yandex) with ESMTPSA id UMkSjYADYGk0-AkLoIPpV; Wed, 21 Jun 2023 18:22:41 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1687360962; bh=lDc4QgnEZC8KLbodk8+haNOeCOpk4ZEgKr8+epbYZ8s=; h=Message-Id:Date:In-Reply-To:Cc:Subject:References:To:From; b=eIQxgQ/KENbUZ2x3qrqriO4S0ZYhAkXI/90UF2KUSj/TTbA+veewMIsiEPhYnRdqt 0V0P/wgTHNei1+XAV7yCi7yD4HZ3Ll1e4DBnlsO+NONxMTp0e/uNDn6HZVSqkGE1/J BP3N5YBMk6d5ek3PfEddmifedtt1aTG0h2dxqna4= Authentication-Results: mail-nwsmtp-smtp-production-main-31.vla.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: Wed, 21 Jun 2023 20:22:12 +0500 Message-Id: <20230621152214.2720319-2-stsp2@yandex.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230621152214.2720319-1-stsp2@yandex.ru> References: <20230621152214.2720319-1-stsp2@yandex.ru> MIME-Version: 1.0 X-Spam-Status: No, score=-0.5 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_NONE,RCVD_IN_VALIDITY_RPBL,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no 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?1769327517009116048?= X-GMAIL-MSGID: =?utf-8?q?1769327517009116048?= 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);