From patchwork Tue Jun 20 09:55:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: stsp X-Patchwork-Id: 110404 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3556225vqr; Tue, 20 Jun 2023 03:14:15 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4CG3TAxPvLfamM0q1kQzhCCAKTaF0vJMmW5y4vFb8xSUHzCwg2ytQeZjNM+KXSE1/a/zIU X-Received: by 2002:a05:6830:1201:b0:6af:fce1:509d with SMTP id r1-20020a056830120100b006affce1509dmr6847325otp.19.1687256055585; Tue, 20 Jun 2023 03:14:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687256055; cv=none; d=google.com; s=arc-20160816; b=JX+nB5yfrFVB2uFIOrpew5faSv07bs99jDlEFk0N9kHkUzjpDa138HeusVoDi63i39 3bn1hUFQOqPOwrB6t1XhgBPDYVj9XaLD2U+CBXGtyMXybpp8uRHCfeB1WVE+RvALU27a l+SQb82bIBEZjJd1khFGjpFuj7820to7sez7c4tYWfR3NEbSJgiGq6Zq/B5g+T4Up0FV tFheBW8bB0n0Gzpw60x1DtGaEuWVR4sJGyg2vtbv8VWGIB5dPSwUrLqFqiHZo3stgJGT 6tZ4s4OVRRl/89mzDhx4GvxefKCdXC9UX6/BQDpXkOXmUglKxfXgLuPFgk7btMmxnN0y ThBA== 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=sUfHCacVyDt7Kg3HyQ2KiMmhLhRyXxIZpN8hmjW6jXw=; b=1EEPDjWh/ojjkV+s8HP3B6PdgkLznQpotNbtqTxUrWq/ScK1PLg0mOieVMssMu9OY4 1933/yMjg5JPoFfBY6xX6FUKntBE1Rc1tJaOmeyKqaTlHFh42RWtd3Y78dp/3buSRnX0 +b7nTu8KqD2cc3MkzpuoQ60aGJzIJbNrqf3vFlZwAa9h4fOIzZXEbmwspP3C7zpmn33h iXtqUeTN5mLkBuXFcQ2jf4pRpQdkQMa3euVWEVUIHhiLhOGYUfE0ulrQaftn+evQ7Akt e087fN2AeOLudI9oX0c+H4b/sA2B9YHhuk5R7lnDsZvmoTjiPTJkcbtXcj/0IW+dpK4h hqvw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@yandex.ru header.s=mail header.b=ceuQ+TxZ; 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 i185-20020a636dc2000000b005533c53f5cesi1470599pgc.27.2023.06.20.03.14.02; Tue, 20 Jun 2023 03:14:15 -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=ceuQ+TxZ; 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 S230144AbjFTKID (ORCPT + 99 others); Tue, 20 Jun 2023 06:08:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40422 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231733AbjFTKHe (ORCPT ); Tue, 20 Jun 2023 06:07:34 -0400 Received: from forward204a.mail.yandex.net (forward204a.mail.yandex.net [178.154.239.89]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3AA41172B; Tue, 20 Jun 2023 03:07:19 -0700 (PDT) Received: from forward103a.mail.yandex.net (forward103a.mail.yandex.net [IPv6:2a02:6b8:c0e:500:1:45:d181:d103]) by forward204a.mail.yandex.net (Yandex) with ESMTP id 13770497AF; Tue, 20 Jun 2023 12:55:51 +0300 (MSK) Received: from mail-nwsmtp-smtp-production-main-51.vla.yp-c.yandex.net (mail-nwsmtp-smtp-production-main-51.vla.yp-c.yandex.net [IPv6:2a02:6b8:c1f:5e51:0:640:23ee:0]) by forward103a.mail.yandex.net (Yandex) with ESMTP id 28811463BB; Tue, 20 Jun 2023 12:55:44 +0300 (MSK) Received: by mail-nwsmtp-smtp-production-main-51.vla.yp-c.yandex.net (smtp/Yandex) with ESMTPSA id Utd7jIuDca60-Htt71yOI; Tue, 20 Jun 2023 12:55:43 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1687254943; bh=sUfHCacVyDt7Kg3HyQ2KiMmhLhRyXxIZpN8hmjW6jXw=; h=Message-Id:Date:In-Reply-To:Cc:Subject:References:To:From; b=ceuQ+TxZ2P+d+L+jTkyDGA54u/cllL0gz+lX6yj7P9w6wz/m2WNtjsLtnH5kiKyLl G0BFqq4UGx/D20fJUH1w3ehXFfQROT2L5XWvgmxREKmLIT5EN/VEfHf68rydRZz/xW MJLXWtUocgpoqlfk9HxgeD6vK3xu9D6/z0o11nzo= Authentication-Results: mail-nwsmtp-smtp-production-main-51.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 Subject: [PATCH 1/3] fs/locks: F_UNLCK extension for F_OFD_GETLK Date: Tue, 20 Jun 2023 14:55:05 +0500 Message-Id: <20230620095507.2677463-2-stsp2@yandex.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230620095507.2677463-1-stsp2@yandex.ru> References: <20230620095507.2677463-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?1769216205477035119?= X-GMAIL-MSGID: =?utf-8?q?1769216205477035119?= 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 --- 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); From patchwork Tue Jun 20 09:55:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: stsp X-Patchwork-Id: 110405 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3558941vqr; Tue, 20 Jun 2023 03:20:12 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6J0hwCZ8G1uJHLivSd6Q6OlgA4V8Cxf9jX4vzFBZKfrzDj1YfHphIJRrNIroNFQSsHEPkl X-Received: by 2002:a17:903:48a:b0:1b5:cbc:b4c with SMTP id jj10-20020a170903048a00b001b50cbc0b4cmr11204023plb.46.1687256411729; Tue, 20 Jun 2023 03:20:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687256411; cv=none; d=google.com; s=arc-20160816; b=qMFi7PxcZPlCukmloNpaaPwWdwxKZK8/lHxpkoL0ZGWK6kCvq60fTXplzgVFgXwYv6 8cdOtstVpKJmWGYbFq01mz/XCb7OiyBKR8HXwhmbBU/Z8SkaNM/sgJx+uNtTWyvJYfYk lanSAEMx35wtI8nkc5jRWZ0P5zF1sw2Kfuvqqi3RPL8eWEz+f0H2p9Jk13jvHcqIq3TJ Gl/PHNpl6X47AeXXmQUOjTCz3NRW4u/Sqz4ZxfVcxw4+V1YvSorzKld93DHOKBegLj2W DGr5vs6BTc6ZgueSwm+Cba5bR/s8LoozqtdAx/+InCQsbdl9H5XKdGtesDaxGurMlZ4k tnlQ== 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=G9Y9dMrT6FQOwfuA3r+IFC4b4bwCTthKlJeujdIJm70=; b=rbIui99mlioxzIMImjB4pkoCP0zHhRIf9o4bDvcM5Y7wx10tospEvV1psURaMNFYO5 XJ+HzTmoW7RokA956HSz2ACXgnyZf7mjMEa3LwZ8Uw6oRNe0d9jME6/LLwt9juv/ENgq 7njDqGcCKYb66S80l0Dj0+JmvkqWBPs5KEAZ0ic9odHRseKhEhdGpPyw7NdgGIsgSbrt VyIBGf7qjUH2Cc5gaB3nrtlmkZopQx1MDP+atsdeGjTV0VozbdhhkdDojAH68woRpY4U W3MdM2PPuLyd+aZcbKKi+sp5+eqJiqv25DXAA0TnPcpv/DdhRevh58xQfbAZ8/EwNwrF 695g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@yandex.ru header.s=mail header.b=PywmBlbr; 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 d11-20020a170902cecb00b001afcd047456si1738747plg.636.2023.06.20.03.19.56; Tue, 20 Jun 2023 03:20:11 -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=PywmBlbr; 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 S231391AbjFTKD1 (ORCPT + 99 others); Tue, 20 Jun 2023 06:03:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35468 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230451AbjFTKDC (ORCPT ); Tue, 20 Jun 2023 06:03:02 -0400 X-Greylist: delayed 62 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Tue, 20 Jun 2023 03:02:14 PDT Received: from forward202a.mail.yandex.net (forward202a.mail.yandex.net [178.154.239.91]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E2A9F1707; Tue, 20 Jun 2023 03:02:13 -0700 (PDT) Received: from forward102a.mail.yandex.net (forward102a.mail.yandex.net [IPv6:2a02:6b8:c0e:500:1:45:d181:d102]) by forward202a.mail.yandex.net (Yandex) with ESMTP id C02DB494FC; Tue, 20 Jun 2023 12:56:05 +0300 (MSK) Received: from mail-nwsmtp-smtp-production-main-51.vla.yp-c.yandex.net (mail-nwsmtp-smtp-production-main-51.vla.yp-c.yandex.net [IPv6:2a02:6b8:c1f:5e51:0:640:23ee:0]) by forward102a.mail.yandex.net (Yandex) with ESMTP id 3E99F46D20; Tue, 20 Jun 2023 12:55:53 +0300 (MSK) Received: by mail-nwsmtp-smtp-production-main-51.vla.yp-c.yandex.net (smtp/Yandex) with ESMTPSA id Utd7jIuDca60-1Wx2nAVR; Tue, 20 Jun 2023 12:55:51 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1687254951; bh=G9Y9dMrT6FQOwfuA3r+IFC4b4bwCTthKlJeujdIJm70=; h=Message-Id:Date:In-Reply-To:Cc:Subject:References:To:From; b=PywmBlbr/auoIhmihGCTALiqPbeNVDX47HbGdTQz2kcwFNI9qdjQUtsQOwZ41xlDp iMx5cWAXXgslcT0ETY8F+nu9XmzyTPXXiMrHXoSQ+Xm6/+IBFSixtk39mwvpkNEceO i7sTeRVDWP1vCoPVtbwqRotHm0Zm1Ztirjs8DTpw= Authentication-Results: mail-nwsmtp-smtp-production-main-51.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 Subject: [PATCH 2/3] fd/locks: allow get the lock owner by F_OFD_GETLK Date: Tue, 20 Jun 2023 14:55:06 +0500 Message-Id: <20230620095507.2677463-3-stsp2@yandex.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230620095507.2677463-1-stsp2@yandex.ru> References: <20230620095507.2677463-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?1769216579190852474?= X-GMAIL-MSGID: =?utf-8?q?1769216579190852474?= Currently F_OFD_GETLK sets the pid of the lock owner to -1. Remove such behavior to allow getting the proper owner's pid. This may be helpful when you want to send some message (like SIGKILL) to the offending locker. 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 --- fs/locks.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/fs/locks.c b/fs/locks.c index 210766007e63..ee265e166542 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -2158,8 +2158,6 @@ static pid_t locks_translate_pid(struct file_lock *fl, struct pid_namespace *ns) pid_t vnr; struct pid *pid; - if (IS_OFDLCK(fl)) - return -1; if (IS_REMOTELCK(fl)) return fl->fl_pid; /* From patchwork Tue Jun 20 09:55:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: stsp X-Patchwork-Id: 110406 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3559842vqr; Tue, 20 Jun 2023 03:22:09 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5Sh3No16GbXBVhUj8BJ+mBTT0Tn7ZOXwuma89iaCDB1rTjsQBl+1PhmYbNgbsI46QvDY9b X-Received: by 2002:a05:6a00:1504:b0:668:9735:573c with SMTP id q4-20020a056a00150400b006689735573cmr1651512pfu.15.1687256529676; Tue, 20 Jun 2023 03:22:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687256529; cv=none; d=google.com; s=arc-20160816; b=m9BvPK/qD7GR3wsAyTdsuNVNtOfxQwT+9dbUhVsdndHw0a/16FEVxgN06J8hwHvfly Y21Dt2zZ1eYrctIoEoGWdmNzsONEZyuzfZ+5M94rmg21d5rimKwlVd1nqnwM8xWR+ZMT t9v3KMKVY8NSLfAlhRaSm/g4NON9j4xTZSBeWuCrCx7qjwvBx377KzZmDeBk+of/EDT4 Gj5NN/yR3yPLGjeD9+tkNhlvoIbD4Wg8DcWnK66JKVg7M18mwvfYKL3kMIhiKFDNoXhq iLm77AGK3E4vsieUu9DGvaFj97CBR0yO93AT2uYMaYjzeQ9mws34Y+qbep1zh/sfVze1 CbTg== 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=rkYmDxtuWXPP1hMHDuX5+P8sJGSUmlxPNxtIqEwkg3w=; b=s6dD1eshXtOBaRulNEXULMMMxnXCMTpugr2o3hCTwK9Vnaw2lQQJtqvWi8fMS4O1Mh ejuRtGmJATKHB+N1uy8IifkaVZvypqcqmyIgPhk/WjEPhVb0DuNbYD4WpH7DJ4l0C6Vj YhApeUpQmL40JNk8UIbDOKpYChHz1DVcQhrKcKACag9hCE9/pluiJbCF/9fmaEpoVlWI W8F0cUnBve7OWdb/kMPOYeKB+Aba7ZfIy/qG7/BNAzq/aTarr9Ad+ZbHet7z9OykT64a YsA6dZ6+5x2tNjL2Smq/jX9ub4+1QW5aML1AGakRTX42LH+OGoNZfqWcZZ+5QpaOcCk0 DSnA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@yandex.ru header.s=mail header.b="D/AGAc49"; 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 c1-20020a637241000000b005481915c0c6si1477022pgn.31.2023.06.20.03.21.55; Tue, 20 Jun 2023 03:22:09 -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="D/AGAc49"; 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 S231612AbjFTKE1 (ORCPT + 99 others); Tue, 20 Jun 2023 06:04:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36060 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231727AbjFTKEN (ORCPT ); Tue, 20 Jun 2023 06:04:13 -0400 X-Greylist: delayed 94 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Tue, 20 Jun 2023 03:03:58 PDT Received: from forward205a.mail.yandex.net (forward205a.mail.yandex.net [178.154.239.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 05D1FE6E; Tue, 20 Jun 2023 03:03:57 -0700 (PDT) Received: from forward100a.mail.yandex.net (forward100a.mail.yandex.net [IPv6:2a02:6b8:c0e:500:1:45:d181:d100]) by forward205a.mail.yandex.net (Yandex) with ESMTP id 05FC24827D; Tue, 20 Jun 2023 12:56:10 +0300 (MSK) Received: from mail-nwsmtp-smtp-production-main-51.vla.yp-c.yandex.net (mail-nwsmtp-smtp-production-main-51.vla.yp-c.yandex.net [IPv6:2a02:6b8:c1f:5e51:0:640:23ee:0]) by forward100a.mail.yandex.net (Yandex) with ESMTP id 3E21D46CF8; Tue, 20 Jun 2023 12:56:04 +0300 (MSK) Received: by mail-nwsmtp-smtp-production-main-51.vla.yp-c.yandex.net (smtp/Yandex) with ESMTPSA id Utd7jIuDca60-C477uvSM; Tue, 20 Jun 2023 12:56:03 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1687254963; bh=rkYmDxtuWXPP1hMHDuX5+P8sJGSUmlxPNxtIqEwkg3w=; h=Message-Id:Date:In-Reply-To:Cc:Subject:References:To:From; b=D/AGAc49Aj7GVb2SA46LvULaSvzlzykalpkesue6nUPQqWCRkQN6tnUrX3lsRuDy3 9HK0v9FvtHGZgqQ6sFh8WAVDBSC+1DCD6txEzvKlunEn2TussWRBtHZyLYHoR/1+Tl ed8JMVYBBW8Q2lGCZM5oeZMtzS2ZewHNpI3jhhRY= Authentication-Results: mail-nwsmtp-smtp-production-main-51.vla.yp-c.yandex.net; dkim=pass header.i=@yandex.ru From: Stas Sergeev To: linux-kernel@vger.kernel.org Cc: Stas Sergeev , Shuah Khan , linux-kselftest@vger.kernel.org, Jeff Layton , Chuck Lever , Alexander Viro , Christian Brauner , linux-fsdevel@vger.kernel.org Subject: [PATCH 3/3] selftests: add OFD lock tests Date: Tue, 20 Jun 2023 14:55:07 +0500 Message-Id: <20230620095507.2677463-4-stsp2@yandex.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230620095507.2677463-1-stsp2@yandex.ru> References: <20230620095507.2677463-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?1769216702901468125?= X-GMAIL-MSGID: =?utf-8?q?1769216702901468125?= Test the basic locking stuff on 2 fds: multiple read locks, conflicts between read and write locks, use of len==0 for queries. Also test for pid and F_UNLCK F_OFD_GETLK extensions. Signed-off-by: Stas Sergeev CC: Shuah Khan CC: linux-kernel@vger.kernel.org CC: linux-kselftest@vger.kernel.org CC: Jeff Layton CC: Chuck Lever CC: Alexander Viro CC: Christian Brauner CC: linux-fsdevel@vger.kernel.org --- tools/testing/selftests/locking/Makefile | 2 + tools/testing/selftests/locking/ofdlocks.c | 138 +++++++++++++++++++++ 2 files changed, 140 insertions(+) create mode 100644 tools/testing/selftests/locking/ofdlocks.c diff --git a/tools/testing/selftests/locking/Makefile b/tools/testing/selftests/locking/Makefile index 6e7761ab3536..a83ced1626de 100644 --- a/tools/testing/selftests/locking/Makefile +++ b/tools/testing/selftests/locking/Makefile @@ -7,4 +7,6 @@ all: TEST_PROGS := ww_mutex.sh +TEST_GEN_PROGS := ofdlocks + include ../lib.mk diff --git a/tools/testing/selftests/locking/ofdlocks.c b/tools/testing/selftests/locking/ofdlocks.c new file mode 100644 index 000000000000..1cff350e2c81 --- /dev/null +++ b/tools/testing/selftests/locking/ofdlocks.c @@ -0,0 +1,138 @@ +// SPDX-License-Identifier: GPL-2.0 + +#define _GNU_SOURCE +#include +#include +#include +#include +#include +#include "../kselftest.h" + +static int lock_set(int fd, struct flock *fl) +{ + int ret; + + fl->l_pid = 0; // needed for OFD locks + fl->l_whence = SEEK_SET; + ret = fcntl(fd, F_OFD_SETLK, fl); + if (ret) + perror("fcntl()"); + return ret; +} + +static int lock_get(int fd, struct flock *fl) +{ + int ret; + + fl->l_pid = 0; // needed for OFD locks + fl->l_whence = SEEK_SET; + ret = fcntl(fd, F_OFD_GETLK, fl); + if (ret) + perror("fcntl()"); + return ret; +} + +int main(void) +{ + int rc; + struct flock fl, fl2; + int fd = open("/tmp/aa", O_RDWR | O_CREAT | O_EXCL, 0600); + int fd2 = open("/tmp/aa", O_RDONLY); + + unlink("aa"); + assert(fd != -1); + assert(fd2 != -1); + ksft_print_msg("[INFO] opened fds %i %i\n", fd, fd2); + + /* Set some read lock */ + fl.l_type = F_RDLCK; + fl.l_start = 5; + fl.l_len = 3; + rc = lock_set(fd, &fl); + if (rc == 0) { + ksft_print_msg + ("[SUCCESS] set OFD read lock on first fd\n"); + } else { + ksft_print_msg("[FAIL] to set OFD read lock on first fd\n"); + return -1; + } + /* Make sure read locks do not conflict on different fds. */ + fl.l_type = F_RDLCK; + fl.l_start = 5; + fl.l_len = 1; + rc = lock_get(fd2, &fl); + if (rc != 0) + return -1; + if (fl.l_type != F_UNLCK) { + ksft_print_msg("[FAIL] read locks conflicted\n"); + return -1; + } + /* Make sure read/write locks do conflict on different fds. */ + fl.l_type = F_WRLCK; + fl.l_start = 5; + fl.l_len = 1; + rc = lock_get(fd2, &fl); + if (rc != 0) + return -1; + if (fl.l_type != F_UNLCK) { + ksft_print_msg + ("[SUCCESS] read and write locks conflicted\n"); + } else { + ksft_print_msg + ("[SUCCESS] read and write locks not conflicted\n"); + return -1; + } + /* Get info about the lock on first fd. */ + fl.l_type = F_UNLCK; + fl.l_start = 5; + fl.l_len = 1; + rc = lock_get(fd, &fl); + if (rc != 0) { + ksft_print_msg + ("[FAIL] F_OFD_GETLK with F_UNLCK not supported\n"); + return -1; + } + if (fl.l_type != F_UNLCK) { + if (fl.l_pid != getpid()) { + ksft_print_msg + ("[FAIL] F_OFD_GETLK does not return pid, %i\n", + fl.l_pid); + return -1; + } + ksft_print_msg + ("[SUCCESS] F_UNLCK test returns: locked, type %i pid %i len %zi\n", + fl.l_type, fl.l_pid, fl.l_len); + } else { + ksft_print_msg + ("[FAIL] F_OFD_GETLK with F_UNLCK did not return lock info\n"); + return -1; + } + /* Try the same but by locking everything by len==0. */ + fl2.l_type = F_UNLCK; + fl2.l_start = 0; + fl2.l_len = 0; + rc = lock_get(fd, &fl2); + if (rc != 0) { + ksft_print_msg + ("[FAIL] F_OFD_GETLK with F_UNLCK not supported\n"); + return -1; + } + if (memcmp(&fl, &fl2, sizeof(fl))) { + ksft_print_msg + ("[FAIL] F_UNLCK test returns: locked, type %i pid %i len %zi\n", + fl.l_type, fl.l_pid, fl.l_len); + return -1; + } + ksft_print_msg("[SUCCESS] F_UNLCK with len==0 returned the same\n"); + /* Get info about the lock on second fd - no locks on it. */ + fl.l_type = F_UNLCK; + fl.l_start = 0; + fl.l_len = 0; + lock_get(fd2, &fl); + if (fl.l_type != F_UNLCK) { + ksft_print_msg + ("[FAIL] F_OFD_GETLK with F_UNLCK return lock info from another fd\n"); + return -1; + } + return 0; +}