From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3C33D64CE9; Tue, 16 Jan 2024 19:46:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705434410; cv=none; b=YgUR0EqHApf3aBqBIxLMkOYHWLhzlZDN7xiDPB0mkC2cU1J247cMfE2HTzpN74w7FX0wlpKEPOuwGbQRWY7by0dVrz0ecwM5v9WQkgAthQyhSlwL+nESxlg+W28mPoKmirbFTYCVc3q4zn5ecPQzFs0+s+ER1lalymo99q1ss00= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705434410; c=relaxed/simple; bh=mcZomUmBofZwrv5P/gxQDWjBxvcbEOUulhgq96eGZ9o=; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID: X-Mailer:In-Reply-To:References:MIME-Version:X-stable: X-Patchwork-Hint:X-stable-base:Content-Transfer-Encoding; b=g40EinJP8zJ9PDONatv6PV++OFbwZP1rDEiuvUMxnARArTtDxC1b+ZAx0qtrLWsTuR46D9v6FcLbClqdy98SzMIDqwhP17KD7AyPcTh2O3Gn308VDFup5oDOsr9sxV3damYibQOUbvad6/6vvgMhG20oqtKkk6ZNituOiHhthVM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=V/wnZgZR; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="V/wnZgZR" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 65CEFC433B1; Tue, 16 Jan 2024 19:46:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705434409; bh=mcZomUmBofZwrv5P/gxQDWjBxvcbEOUulhgq96eGZ9o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V/wnZgZRrdGTto6tjy2MfQBZDEgM/68W/eiVHplWoMyvV8knP42I4joLHnGJMXBY9 rJ7d418oCUDTf0djlkKMnaOTlDIz9/5qD/mnT4mslrsPdE5iz10pTKdzea83Ywts7S NlA4VNDL4pSYPWWBBWiw5atxK1sJheCOK5965aBdztSwDacNjRCX5hIGLvGiUCkk+K yjlt2ShLLnHTmD3hg363J+dBU9+0i3gRQzs7fFNdQ1MrXLBOwP61I1rndz0uXIEwee M0Rot3o0D/goHtrXZT7K1fijy3n6aIWjudSDD3YZ93LvQYxkR8DEFmpwyAYSnX/kkG WwbgKp1n7SjQw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Wen Gu , Wenjia Zhang , "David S . Miller" , Sasha Levin , jaka@linux.ibm.com, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, linux-s390@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 6.7 100/108] net/smc: disable SEID on non-s390 archs where virtual ISM may be used Date: Tue, 16 Jan 2024 14:40:06 -0500 Message-ID: <20240116194225.250921-100-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240116194225.250921-1-sashal@kernel.org> References: <20240116194225.250921-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.7 Content-Transfer-Encoding: 8bit From: Wen Gu [ Upstream commit c6b8b8eb49904018e22e4e4b1fa502e57dc747d9 ] The system EID (SEID) is an internal EID used by SMC-D to represent the s390 physical machine that OS is executing on. On s390 architecture, it predefined by fixed string and part of cpuid and is enabled regardless of whether underlay device is virtual ISM or platform firmware ISM. However on non-s390 architectures where SMC-D can be used with virtual ISM devices, there is no similar information to identify physical machines, especially in virtualization scenarios. So in such cases, SEID is forcibly disabled and the user-defined UEID will be used to represent the communicable space. Signed-off-by: Wen Gu Reviewed-and-tested-by: Wenjia Zhang Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/smc/smc_clc.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/net/smc/smc_clc.c b/net/smc/smc_clc.c index 72f4d81a3f41..1489a8421d78 100644 --- a/net/smc/smc_clc.c +++ b/net/smc/smc_clc.c @@ -155,10 +155,12 @@ static int smc_clc_ueid_remove(char *ueid) rc = 0; } } +#if IS_ENABLED(CONFIG_S390) if (!rc && !smc_clc_eid_table.ueid_cnt) { smc_clc_eid_table.seid_enabled = 1; rc = -EAGAIN; /* indicate success and enabling of seid */ } +#endif write_unlock(&smc_clc_eid_table.lock); return rc; } @@ -273,22 +275,30 @@ int smc_nl_dump_seid(struct sk_buff *skb, struct netlink_callback *cb) int smc_nl_enable_seid(struct sk_buff *skb, struct genl_info *info) { +#if IS_ENABLED(CONFIG_S390) write_lock(&smc_clc_eid_table.lock); smc_clc_eid_table.seid_enabled = 1; write_unlock(&smc_clc_eid_table.lock); return 0; +#else + return -EOPNOTSUPP; +#endif } int smc_nl_disable_seid(struct sk_buff *skb, struct genl_info *info) { int rc = 0; +#if IS_ENABLED(CONFIG_S390) write_lock(&smc_clc_eid_table.lock); if (!smc_clc_eid_table.ueid_cnt) rc = -ENOENT; else smc_clc_eid_table.seid_enabled = 0; write_unlock(&smc_clc_eid_table.lock); +#else + rc = -EOPNOTSUPP; +#endif return rc; } @@ -1269,7 +1279,11 @@ void __init smc_clc_init(void) INIT_LIST_HEAD(&smc_clc_eid_table.list); rwlock_init(&smc_clc_eid_table.lock); smc_clc_eid_table.ueid_cnt = 0; +#if IS_ENABLED(CONFIG_S390) smc_clc_eid_table.seid_enabled = 1; +#else + smc_clc_eid_table.seid_enabled = 0; +#endif } void smc_clc_exit(void) -- 2.43.0