From patchwork Wed Apr 16 22:16:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mateusz Guzik X-Patchwork-Id: 14054524 Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com [209.85.218.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6ABD92DFA42; Wed, 16 Apr 2025 22:16:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744841804; cv=none; b=F6R7v2MNEmEeot1VfwyeowIVikuvEYFQh1xR1ib9MIVQwSyNEgHoNF8TuCZ2tgQzbHuS6KWkOYZoCLfakMiD5ubZ1Efz2LZGmNPZb7D4wmwGNEjWOS5fL69kJC0BKh6bUF7lZW+gEDF4x5pNqc5FUhTX8E3kjEvuxJE8/V79G88= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744841804; c=relaxed/simple; bh=nSmmzdD+pQetXo9lVLPsZ5t/jfAADgeWQITWfkNK9bM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PxCtXaahA7GtWOGuLE9+KwsRRDr6MJJOoLGiUZXsbIVP0py6KNOT4UyugmMqrpnquiC/62YigxYjuXaZ7MOibAe839a2Uf5yzQgnDFqp//3SJdDDZF77yG+mkwYHfyMtFY0mUuEPdj23vnDNvBZuQ/eT80PuuRPVD6Lci35FzBw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=jDdU7yqh; arc=none smtp.client-ip=209.85.218.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="jDdU7yqh" Received: by mail-ej1-f52.google.com with SMTP id a640c23a62f3a-ac345bd8e13so21359766b.0; Wed, 16 Apr 2025 15:16:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744841800; x=1745446600; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hEz6h0gt1CPxDzmuBdENeEBNB0I85Lt72JrHUOpOfHY=; b=jDdU7yqhKe/qBShKMsGuOsxYA+WveL4BZf4SOob2YPjA/Iu6/3sXDNr1yi7mFkxfKE IsNUoxFn0rhAMl1SOAxe0RNN6i8H0IJTeKOzA4QrpZfGys6Sb4u0TBSwhYbOYOw54LF4 rW8tb2qOA70sHbZyurGK9+aBHC0EccCPodm2SCHcw+1yuuMy8gt96fBkXJhh+wUn6g53 FFGxwioNMTIgLm2WPjNbyLCp9NNcq6CrmsW1ZAbMmuYaI2bVhulHZrWQENWVydMf0kAg lQO2nOpC4NQrnB5DKr3QGqQvQCh3MQuNgfFgvx1bM3wSikJfyOEVD7a1C7KLS8WCmRdO BRyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744841800; x=1745446600; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hEz6h0gt1CPxDzmuBdENeEBNB0I85Lt72JrHUOpOfHY=; b=kd/N4dxBKRgQeEVRGyCKc5yhYcJ/AcqbBAOvhBkIOpyAjXSnjsqhcYWRfBfskPNKrT 6RPTinn8EG5bH3G0aD9mv4YOEBXvRiTnfvsNoCeCRsXhbCadt+ThJA4DCcJkTK4vxGg9 uhZbbNp9rAdsGKDEMsTXrsscKfZq/XbZJrvnnoiAM96CpFmaql2weDsa1k07yweQF/X2 ttMk2nvEdZIXLBU3JZiww1yycepmKQKIcPzCrOlh5d/44wMfbPC3HPyznKFQ7j6z2U80 K2YJwIEUKQORyiNs07apGC1cEOqKsauGUWsjBA5+H6KXmcoUuQaBT4yBEqNCL7DgeKMk WVaA== X-Forwarded-Encrypted: i=1; AJvYcCVke+X8wJOFhBAN9NVA0i607m/NOLzjGQCiIy4yxnpbzIFuaNcdypyzMiD2lmabfRIOGWnMaLq6v65r1zNP@vger.kernel.org, AJvYcCWXGlgJqirjqijSY98riXg1BnaDdivHc4vI3PkU078btiE1gCmV6m0y9R0UuIBxm4QiMVjH0uqRZT7fryN7@vger.kernel.org X-Gm-Message-State: AOJu0YyF6Pzip6lp788A1QzDPwW+4Lm4M+YsMNTvyPoFTfT1A3ABa+yj HyeDu2GGaaXWW77Culm8bBFSu+8u7yw3lIFHK6uAD/5zLoaP/7iI X-Gm-Gg: ASbGncvWBMPXQj46n2FihN6ncFbOfZZqizSg/iXWU5/oZ6ciAblT5NfIDN6qDt1nQVL POUQ1c1rkXYl4Li4+qmu+76NZ2GusFA+cIOme6GWzTE+8UCjJfX14RLbcZlomavbsurb9X9P8a+ m00dL0MYvHC9gtHdgPV57VCtambuclbNN4lItc3XO2HzRucwXmRG/zjXIJcq63QEufoTRnY2Bqi 0aRWJjTrb0OfNBurK0OnQWzbAa6xLzxo3B801EqN/oZap8azZOedom6eTa5QAQRSQ2okyX6VHv8 8Yn8ED50oLUcu2KnML0z7Gtb9peb5QLU3uQRg6dzHObX0mACCChO8AOwCgk= X-Google-Smtp-Source: AGHT+IHOCpOZZnR+Coe4nDj31jsfrIf2WEG6UCdI5UpFUGQaUUJESSP1MXBj5F3+YIPFwVBOnC0J7A== X-Received: by 2002:a17:906:c450:b0:acb:5f17:624d with SMTP id a640c23a62f3a-acb5f176accmr15187566b.57.1744841800529; Wed, 16 Apr 2025 15:16:40 -0700 (PDT) Received: from f.. (cst-prg-69-142.cust.vodafone.cz. [46.135.69.142]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-acb3d128c9esm194762866b.108.2025.04.16.15.16.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Apr 2025 15:16:39 -0700 (PDT) From: Mateusz Guzik To: brauner@kernel.org Cc: torvalds@linux-foundation.org, viro@zeniv.linux.org.uk, jack@suse.cz, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, Mateusz Guzik Subject: [PATCH 1/2] fs: touch up predicts in inode_permission() Date: Thu, 17 Apr 2025 00:16:25 +0200 Message-ID: <20250416221626.2710239-2-mjguzik@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250416221626.2710239-1-mjguzik@gmail.com> References: <20250416221626.2710239-1-mjguzik@gmail.com> Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The routine only encounters errors when people try to access things they can't, which is a negligible amount of calls. The only questionable bit might be the pre-existing predict around MAY_WRITE. Currently the routine is predominantly used for MAY_EXEC, so this makes some sense. I verified this straightens out the asm. Signed-off-by: Mateusz Guzik --- fs/namei.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index daebc307c1a3..cff69c12d6fd 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -571,14 +571,14 @@ int inode_permission(struct mnt_idmap *idmap, int retval; retval = sb_permission(inode->i_sb, inode, mask); - if (retval) + if (unlikely(retval)) return retval; if (unlikely(mask & MAY_WRITE)) { /* * Nobody gets write access to an immutable file. */ - if (IS_IMMUTABLE(inode)) + if (unlikely(IS_IMMUTABLE(inode))) return -EPERM; /* @@ -586,16 +586,16 @@ int inode_permission(struct mnt_idmap *idmap, * written back improperly if their true value is unknown * to the vfs. */ - if (HAS_UNMAPPED_ID(idmap, inode)) + if (unlikely(HAS_UNMAPPED_ID(idmap, inode))) return -EACCES; } retval = do_inode_permission(idmap, inode, mask); - if (retval) + if (unlikely(retval)) return retval; retval = devcgroup_inode_permission(inode, mask); - if (retval) + if (unlikely(retval)) return retval; return security_inode_permission(inode, mask); From patchwork Wed Apr 16 22:16:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mateusz Guzik X-Patchwork-Id: 14054525 Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6427122F155; Wed, 16 Apr 2025 22:16:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744841808; cv=none; b=mGhvWtbcp1rxNX+5cCYkbnhIqiTGqGZRGQT+mNYWmB7AjSfj4AEmYr8h9ZLd/1cfAJdpkrSQgyM4MB71NSDYDh6n7uJ5EIPLELUk5XQHEMgNXMdcBSMNhvf83SURN5K2EA6k8+jJQ/doDLX0/GgV2LoWx0YCPOR7nlyGnDMBqkI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744841808; c=relaxed/simple; bh=FwTNfiHfbC0HDRHheElNAKV8Nx2RW5/zWcdr9BsdPOY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Og42KM1pzGERn4ECbP23tEqdzI3WGhX7XLMk5PG/tNkEX/yPZw11xl0vvJZxBUL08QE6ovfa4I/6iQSxcN08CM+irT0FUgkc11ei+O3lM006TNylHL26DyyPfX5Sig+Elyo6YsUri5pG0Kqk6Qlf+DPjcfp9imAUtSKMstOp/l8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=gZxCGv7z; arc=none smtp.client-ip=209.85.218.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="gZxCGv7z" Received: by mail-ej1-f44.google.com with SMTP id a640c23a62f3a-ac2aeada833so37404566b.0; Wed, 16 Apr 2025 15:16:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744841804; x=1745446604; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FLh1QFCNqwVf3EiNnVoF4ICoDFZXITHIKSThtmpBrk0=; b=gZxCGv7zwTKjIBCm9/24Q/+YWegGmsVcnO+wwe6H0/WYewnHEefdGE9PilYa8olfBt 0PhO+WGBT64DGPljVBvZlgy4LMTDulxKQaED6iRD+CzdCyIhz9PWDhlBjb1XbTD+JJ6b TbaXQePOYtPbnSi9DJurQCOzmBF/iwHkPYAJoi8DoJPNhkQP5emwxqX5xQ/nKqLXovlW MhwQljLjH4K27WAKSR4b4c22aAdagWd+mJbVmS5aDook6ixnRs5yvGNZ6xAe/Ae8CwXb /ATB3zFGflZ//88gaGPfdnKzsLWEC0mtcXIpPUEjVQ48wRgRq6c6FKP0YqQ2nRsaDkFr pnlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744841804; x=1745446604; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FLh1QFCNqwVf3EiNnVoF4ICoDFZXITHIKSThtmpBrk0=; b=xPUWfYlFpp2Fy/vEcDyc5MxPGnxV7xzHQD7aUo+CyH59XdnXvmBKz1fxngYPujmd8y BqbSRSu3/OEiX22C+NPfyTWXEuC8eSt5Bzeda90ByuokUiACNfFU950Z1jO4WtTfuv7S Ypyp3rA7YiWYXBPb8pqRrDwwfvX8Hzr1pivcyP+fuuGGHxq1HADs/wjWm1LQrU8/erxw 2TlntccdoE4lOksXpUXaqt6tA4CTcm3mgKsEwOkJELsiKTI/KXqSno2NXjUHkxtqjJlL Y5taLYeijnjJ5j4p05bBwsz8rcohmpsiSt3GKeIBZVpuRNnGW46YU0sMNbKyZ9J6gvnK axxw== X-Forwarded-Encrypted: i=1; AJvYcCVZakOAGnQ7wLhRrINxXHXVZ5ZBkR22envclPAHA0tUANS5s5N+OqgDmY66SEhDLSvjlBx8ZP7KeUSBqtK5@vger.kernel.org, AJvYcCXi36ic3HUU4jA4iMVicklRmDoKe24bSxgz62Pbz8LTT+eNwK3TSj3VH6EIoqmQhFNGwCgLKnAFc1mvibNR@vger.kernel.org X-Gm-Message-State: AOJu0YwkhBscLeLdZ+/JdPUpusL94UAY/BwzlTnGgsTcTTgZEt1g8jHb iw3l5GQLkQ6II3AHC5YllINs2QsbuktjWIqE6k0+a9B/f6ScEHDY X-Gm-Gg: ASbGncu4fAphy0ihFjpl8t+Sp5NNfjzPJVAH80kVsZYVII6kzAZbvr1aSEbR1WtGLcL U0ZwfBvIDyD20Ei5ENrDvz+RCcPweKnpcOUFq0Iq/G3AywyHkdz6i1TQbqG8y/1+RHb+h8RXjw6 Q43fvOw58oTMSBFg86oRC3ukgkjuK1NtICvyPpolDLmTRgTl/0BW5NYDQDcfMSpcnkDpZo1tvn5 lowep53WdMebpYJjsTJsGOEi6mrVdaM0UT0/zlQRop18FaE/YBNm2IObKrCsDmE5qA6/4shQEbQ sxDF+dce3uWSJAbV4ZRlL8uvi2MLWzWU1W34xhGQS7K+3DIjLDrqmiN4SGo= X-Google-Smtp-Source: AGHT+IGp5Y0TA+wbDYpWlyUIGWyykJW/C67dTsFEMK8J4FVpnrAZa3NAGUAnXz0hsiwufnM2anl4Ng== X-Received: by 2002:a17:907:7da0:b0:ac1:ecb0:ca98 with SMTP id a640c23a62f3a-acb5a6d17d2mr36543666b.26.1744841804312; Wed, 16 Apr 2025 15:16:44 -0700 (PDT) Received: from f.. (cst-prg-69-142.cust.vodafone.cz. [46.135.69.142]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-acb3d128c9esm194762866b.108.2025.04.16.15.16.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Apr 2025 15:16:43 -0700 (PDT) From: Mateusz Guzik To: brauner@kernel.org Cc: torvalds@linux-foundation.org, viro@zeniv.linux.org.uk, jack@suse.cz, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, Mateusz Guzik Subject: [PATCH 2/2] device_cgroup: avoid access to ->i_rdev in the common case in devcgroup_inode_permission() Date: Thu, 17 Apr 2025 00:16:26 +0200 Message-ID: <20250416221626.2710239-3-mjguzik@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250416221626.2710239-1-mjguzik@gmail.com> References: <20250416221626.2710239-1-mjguzik@gmail.com> Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The routine gets called for every path component during lookup. ->i_mode is going to be cached on account of permission checks, while ->i_rdev is an area which is most likely cache-cold. gcc 14.2 is kind enough to emit one branch: movzwl (%rbx),%eax mov %eax,%edx and $0xb000,%dx cmp $0x2000,%dx je 11bc This patch is lazy in that I don't know if the ->i_rdev branch makes any sense with the newly added mode check upfront. I am not changing any semantics here though. Signed-off-by: Mateusz Guzik --- include/linux/device_cgroup.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/include/linux/device_cgroup.h b/include/linux/device_cgroup.h index d02f32b7514e..0864773a57e8 100644 --- a/include/linux/device_cgroup.h +++ b/include/linux/device_cgroup.h @@ -18,15 +18,16 @@ static inline int devcgroup_inode_permission(struct inode *inode, int mask) { short type, access = 0; + if (likely(!S_ISBLK(inode->i_mode) && !S_ISCHR(inode->i_mode))) + return 0; + if (likely(!inode->i_rdev)) return 0; if (S_ISBLK(inode->i_mode)) type = DEVCG_DEV_BLOCK; - else if (S_ISCHR(inode->i_mode)) + else /* S_ISCHR by the test above */ type = DEVCG_DEV_CHAR; - else - return 0; if (mask & MAY_WRITE) access |= DEVCG_ACC_WRITE;