From patchwork Tue Sep 12 14:16:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 13381770 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 515E7CA0EED for ; Tue, 12 Sep 2023 14:18:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:Message-ID: References:Mime-Version:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=VNEx2gd1sQjbxdNqL+LogZ2yOh3k0Pqg5criPg5cFVw=; b=MNxv9ftgFrr1gmRAGSnhG+zKqq m3sjBM3YYl19QkGrEARHRrLKDOn53yIrnv2bD7UFuZP0AP6v8beqPrlaAlBFvkZEukQH6EKb+QB0m f072xuEMeZbj/UGUaxf+bt5Vgk21mqLgDhfsNDXpRIORwreJqTgkv/4a2pmyq/E4QdWoDfAvXXNfh 9XTCqDDe+hVtOzSgJUS0w6D7SOkBspplG4KSg7Bj89DOMUzpQJZrPaou8sEUzFepDVCn9pv2LrlI/ bTF4caBsecwr67LB75UkxA+EsbvUAEtgjR/7iB1eTfgpB0DuUoD3MUJv2UKPtwIL+sC47S9H++DMq bZ4nWJQA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qg4DF-003WEO-23; Tue, 12 Sep 2023 14:17:57 +0000 Received: from mail-wr1-x449.google.com ([2a00:1450:4864:20::449]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qg4D7-003W69-2C for linux-arm-kernel@lists.infradead.org; Tue, 12 Sep 2023 14:17:51 +0000 Received: by mail-wr1-x449.google.com with SMTP id ffacd0b85a97d-31aed15ce6fso3513848f8f.3 for ; Tue, 12 Sep 2023 07:17:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1694528268; x=1695133068; darn=lists.infradead.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=mj2P9EYaaemecU+L4Ww9YzwcvsDLGOKJqjgIcK+uvQU=; b=IKex2gy0ftuZJC6a9zdyGiITNY7IvqSyITX5/YTqnhFR5pPwovZTSSojpykwxu+vni oLToWGnsK9OHGwyDiPWwncSSeOec83lfcMXgouUtyVaCUo00crVCJhOa+q5JVPlL+7CW 4hfSs7jsEuSEweDZIk2v91kcJmPEeRisnD31l9rAg2HfNZkk3pVlL7CjwTM3hjg74SoV kHsvH3D3H0tXc3Llju2rAw28BVR3uvtkhC8ijZAESM2s18lUoaD5rcaS6pMx6pjNOSPh 3h+o2a1Ly1FiA4emKf8Oy5nXvv0ePT/4wasRNK/7Tq5kqd9Li37juEswzAfT8zxzRfPl x26A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694528268; x=1695133068; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=mj2P9EYaaemecU+L4Ww9YzwcvsDLGOKJqjgIcK+uvQU=; b=j6uOoajRLoejvmDpXWXqIK4q2yZKdAQQ6eNSqkKEQolZYGqJD5JHRGKir+27iu/lP5 fir59jUOUIyy+lxJYVpvasHPVSzx0Uk/rBqykt6HXJ64FUu+PjmYfCQtj2g+T7mwEH8n XG6mqAEE/OV4K9An6gDRaEpar5MmWTVOakqdv4+5dE9N1je52demhnuP/DTFm5hlKFJF FvCvT+I6BWoiyhXqqih5RcvLZiTp/3SG/hX+fYbVjiHokdHJIeMB8dVHaevRoMniPrVh clfiII93mzWzrVaNZOvZM7MzwX1YgXHsTcjhA953mM5RHWJcmBrVGWBZBwKcg6IWwwEb 2h2w== X-Gm-Message-State: AOJu0YwIS0sPrltKg2Fcpv1LyiCmpsdygMVsxcTGDXbEpd9pY+4oEtuu Z1HaMT8iXKy2XjLP+UgomkOQs9iNYqD64BZkGkn8/sb+kHUFSagaeHSKM3SbrRrOBi6hx66vkTj lRHb/FVcuvtCh/Y/pBGRE4aikvTgN179YBpX/4dvzF6hVOVMsAGZ7rITP2h08Tp0LyNi1sYTUwY 4= X-Google-Smtp-Source: AGHT+IFO3sKfQu7yWaktt4mXC+tWM2QANfyhmY8U24KJc8wtWKcTjvYf/hWg6g3/SCgfIgdq8tGpNWKM X-Received: from palermo.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:118a]) (user=ardb job=sendgmr) by 2002:a5d:68ca:0:b0:317:3c15:b589 with SMTP id p10-20020a5d68ca000000b003173c15b589mr141873wrw.11.1694528267650; Tue, 12 Sep 2023 07:17:47 -0700 (PDT) Date: Tue, 12 Sep 2023 14:16:04 +0000 In-Reply-To: <20230912141549.278777-63-ardb@google.com> Mime-Version: 1.0 References: <20230912141549.278777-63-ardb@google.com> X-Developer-Key: i=ardb@kernel.org; a=openpgp; fpr=F43D03328115A198C90016883D200E9CA6329909 X-Developer-Signature: v=1; a=openpgp-sha256; l=1685; i=ardb@kernel.org; h=from:subject; bh=5r9ZDvRf/5Qx3wG13F8lcLnVag+F7odStGTabgSgb8U=; b=owGbwMvMwCFmkMcZplerG8N4Wi2JIZWhaAl7ieeuGuuD/Z5vcq9pSfy/xXRmuyxXu8lm/8fnZ 5crND/qKGVhEONgkBVTZBGY/ffdztMTpWqdZ8nCzGFlAhnCwMUpABM5WMLwP2h5ysWK2UWe1/mv pHYXtIdLHGnaWlgVWlS0tlm7SYk7npFh4bX52ntkHjud/86cdazGssX1+r0tp5raS5ovLnjdcNC PBwA= X-Mailer: git-send-email 2.42.0.283.g2d96d420d3-goog Message-ID: <20230912141549.278777-77-ardb@google.com> Subject: [PATCH v4 14/61] arm64: idreg-override: Omit non-NULL checks for override pointer From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org Cc: Ard Biesheuvel , Catalin Marinas , Will Deacon , Marc Zyngier , Mark Rutland , Ryan Roberts , Anshuman Khandual , Kees Cook , Joey Gouly X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230912_071749_723897_9A6337D8 X-CRM114-Status: GOOD ( 14.13 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Ard Biesheuvel Now that override pointers are always set, we can drop the various non-NULL checks that we have in the code. Signed-off-by: Ard Biesheuvel --- arch/arm64/kernel/idreg-override.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/arch/arm64/kernel/idreg-override.c b/arch/arm64/kernel/idreg-override.c index 3addc09f8746..536bc33859bc 100644 --- a/arch/arm64/kernel/idreg-override.c +++ b/arch/arm64/kernel/idreg-override.c @@ -216,9 +216,6 @@ static void __init match_options(const char *cmdline) for (i = 0; i < ARRAY_SIZE(regs); i++) { int f; - if (!regs[i]->override) - continue; - for (f = 0; strlen(regs[i]->fields[f].name); f++) { u64 shift = regs[i]->fields[f].shift; u64 width = regs[i]->fields[f].width ?: 4; @@ -319,10 +316,8 @@ asmlinkage void __init init_feature_override(u64 boot_status) int i; for (i = 0; i < ARRAY_SIZE(regs); i++) { - if (regs[i]->override) { - regs[i]->override->val = 0; - regs[i]->override->mask = 0; - } + regs[i]->override->val = 0; + regs[i]->override->mask = 0; } __boot_status = boot_status; @@ -330,9 +325,8 @@ asmlinkage void __init init_feature_override(u64 boot_status) parse_cmdline(); for (i = 0; i < ARRAY_SIZE(regs); i++) { - if (regs[i]->override) - dcache_clean_inval_poc((unsigned long)regs[i]->override, - (unsigned long)regs[i]->override + - sizeof(*regs[i]->override)); + dcache_clean_inval_poc((unsigned long)regs[i]->override, + (unsigned long)regs[i]->override + + sizeof(*regs[i]->override)); } }