From patchwork Mon Apr 3 11:10:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirill A. Shutemov" X-Patchwork-Id: 78506 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2225214vqo; Mon, 3 Apr 2023 04:24:55 -0700 (PDT) X-Google-Smtp-Source: AKy350ZHV4b0g1wy8WGL2pW8CKi7urNSbinIdQzYkoOg7XQIiLKxrLYmEUtUE1cTK4tSWz1OzRcY X-Received: by 2002:a17:90b:180e:b0:23e:f867:e0b with SMTP id lw14-20020a17090b180e00b0023ef8670e0bmr35550535pjb.49.1680521094894; Mon, 03 Apr 2023 04:24:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680521094; cv=none; d=google.com; s=arc-20160816; b=HWsIyGzW0UWDkGbUMzU64m8XbLRzsq+fTGQcv0ORtdBnCr7R506IRJXKIdruQYF7IQ RK2HWWaWrUJSQR/DXCJq0xlypfmRFDgSKcQ2/ONKZz0OZZqm1zkJFs+geBE+Ps6e7UOO IFRq1vW/b38xHwhQjr5/hONFrR+geNS7nKcMbs5BAYGB/R0lu9JgYL2F4MLCZMhee+6M 7f0fOeuH5OtNeqSnLmQFpaprZxMpd9XJkcwA+8BGRu6RiH9EjX53SRvPRKQJ24xnZ+dS 1yC550HrvZIWvTx2w0WoRmNrBjXqcJSUe9gLtbHGG4z6mHU5bS7U9KDPWdWKvwZeX4/5 6tiw== 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=RFF2DT7gPz9dkrT0bvcQuiTJ321nmdo8T596rPtuDBk=; b=ixfUue3OzgSJm54mAyPOyMkHnMOLSrDNzpWkehNjXgf8/AQ/2RqsGC0kl9TqdZ3dO0 MwNkWgjx9aUOtrKv0B3ik7oQ6FWJ/hK5EXWA6LlVq3xzTDrHh8bl0Q0LeXxHL+3KxHA9 PxVWIDba7i7jOLuqBpD5gSRLbYpRK2Ha0fiwQY8MVsOOL2+ycxmWAwSWDfrYgez2V4ux Uvdj5zc8ZgvmwUw3dqhvEfnTcHBIPos6cvrAP16KxcO2PRWLBMPQfrrnZVyd/XUEF/yV mz6z3NgWCos7nntAHlfv6cMx6MDnUfyMerHl/8gw/skGQZOyEayCteDPUuGoYYaYf51W cTBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=kGMAzK0f; 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=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b15-20020a17090a488f00b0023cfd288a09si7440668pjh.157.2023.04.03.04.24.42; Mon, 03 Apr 2023 04:24:54 -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=@intel.com header.s=Intel header.b=kGMAzK0f; 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=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232201AbjDCLLY (ORCPT + 99 others); Mon, 3 Apr 2023 07:11:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33116 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232054AbjDCLLK (ORCPT ); Mon, 3 Apr 2023 07:11:10 -0400 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1E605423C for ; Mon, 3 Apr 2023 04:10:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1680520233; x=1712056233; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=txlqjFMOsvS5xVXf0Recvi0uKBTdvCldZTwjgTHY5/8=; b=kGMAzK0fLwFaTBtjjpMyhYe16k38+9jX4V4UzF5f121T2w9NNcFQlBTK ltNEWE8aRNX/7fxBL+a2LwMtWACWwM1rlTzrU1isW/H3FYAiaMuBiTDx3 AP/JxLLI+v51Wj9gTnb6ytfeVeaUN0HsjBH2CH1uwM66coByZN3C47mjZ cV1kbaRizUsJt56XTPAxfPV7G5zzvIP9Rr+scxr9yDTi1jkIodi/Y7w1F AYVqyKQM8Kbi/rBl1PwxNNnXL7e744DQkidpPYooBFcQt0ypYakvOVUdM 591XatCXscfwHhUUn0ZR8NK0Yms2nskSOLcMiUhb8dbYinal0Cg8Q89mo A==; X-IronPort-AV: E=McAfee;i="6600,9927,10668"; a="330440411" X-IronPort-AV: E=Sophos;i="5.98,314,1673942400"; d="scan'208";a="330440411" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Apr 2023 04:10:31 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10668"; a="860164460" X-IronPort-AV: E=Sophos;i="5.98,314,1673942400"; d="scan'208";a="860164460" Received: from amomin-mobl1.ger.corp.intel.com (HELO box.shutemov.name) ([10.251.210.227]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Apr 2023 04:10:26 -0700 Received: by box.shutemov.name (Postfix, from userid 1000) id E86BE10DFD1; Mon, 3 Apr 2023 14:10:23 +0300 (+03) From: "Kirill A. Shutemov" To: Dave Hansen , Andy Lutomirski , Peter Zijlstra Cc: x86@kernel.org, Kostya Serebryany , Andrey Ryabinin , Andrey Konovalov , Alexander Potapenko , Taras Madan , Dmitry Vyukov , "H . J . Lu" , Andi Kleen , Rick Edgecombe , Bharata B Rao , Jacob Pan , Ashok Raj , Linus Torvalds , linux-mm@kvack.org, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" Subject: [PATCH 1/2] x86/mm/iommu/sva: Fix error code for LAM enabling failure due to SVA Date: Mon, 3 Apr 2023 14:10:19 +0300 Message-Id: <20230403111020.3136-2-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230403111020.3136-1-kirill.shutemov@linux.intel.com> References: <20230403111020.3136-1-kirill.shutemov@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.4 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE autolearn=unavailable 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?1762154087837078569?= X-GMAIL-MSGID: =?utf-8?q?1762154087837078569?= Normally, LAM and SVA are mutually exclusive. LAM enabling will fail if SVA is already in use. Correct error code for the failure. EINTR is nonsensical there. Signed-off-by: Kirill A. Shutemov Fixes: 23e5d9ec2bab ("x86/mm/iommu/sva: Make LAM and SVA mutually exclusive") Reported-by: Dmitry Vyukov Reviewed-by: Dmitry Vyukov --- arch/x86/kernel/process_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c index 74c7e84a94d8..c7dfd727c9ec 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c @@ -760,7 +760,7 @@ static int prctl_enable_tagged_addr(struct mm_struct *mm, unsigned long nr_bits) if (mm_valid_pasid(mm) && !test_bit(MM_CONTEXT_FORCE_TAGGED_SVA, &mm->context.flags)) - return -EINTR; + return -EINVAL; if (mmap_write_lock_killable(mm)) return -EINTR;