Received: by 2002:ac8:4f8f:0:b0:429:955e:b7c6 with SMTP id j15csp12171qtw; Tue, 16 Jan 2024 13:16:33 -0800 (PST) X-Google-Smtp-Source: AGHT+IEnAER90WOmWevS/DIcG6SAI9A3qPFjMWsI3B2qqwK1zFmhyAEWOYnWx28P90jFIgWLYK8b X-Received: by 2002:a05:6a20:d046:b0:19a:fbd9:28bb with SMTP id hv6-20020a056a20d04600b0019afbd928bbmr2879805pzb.9.1705439792801; Tue, 16 Jan 2024 13:16:32 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705439792; cv=pass; d=google.com; s=arc-20160816; b=bcIc7CmMDM6TAiEGUlglqop7SqEmJSOm6gBWbYueodfIDju7RA9dWhboILCAR/G5rH +djlXRi/vuFjz/AQnuIQPB1YYkFMGeWfcjYNrWhSLpA+3RzoO7TaKInkPrQRoqGO9czt /6fUqSTcXTWRvBCkwHKIzoI1NghpRraQHwxIL2VbL1k6JllmF1m7p2zAEnE+87lFsCfY LehSZIZnXLFjKMaOEHmFm4Hkmyz7oc9OFDHOP87EYuYYtehaP3nTTqy6fj1Fo9sqKQ2D /PfW2lTipOiJlAoj/sUKull0zIGUf9o86lxXTw/BcEJs4rXiMenozK/VmykNhG9nwsFi fBxQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=lvNtdMdNGTPMfSZOD5dSR2bcP7Xt9bpBDyOOunC0I0g=; fh=e10CQVSo5JTzoz2ShemP/uwWoAr7DTrK/uvWCa+HD7M=; b=n+kTsgAK/eym+sweMAdmnZxD/p21c0orI6O4QreniJskGa3wRR1d3ikVHdFxI9/7uR MPOISD1HPCQ+195FQCnN3mIsGwYfgBZF1yIiqFwf33YyXlWygzKzTZLD6jm0RGC3KZbN fPgVUiM18L2FWebtK5LCUkoxgqY0FiSGzvzhMgqmrNRn5N7AHyDvgAuf24e0ugw57CgI 3XQWqHjCHkrxleOqNArWmgtNrSv3LZgvzSJI8wMN6vn1Lr/nLYs76UKKnCVpLDTnfsDs EbTZ8X64p5XGFOyGQmSv/qRElLkv+iWgIq9fExWkTObPaBfO3EURaABBgaw3/DONO7GM tQlA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=PLxoNuvH; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-28009-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-28009-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id ca13-20020a056a02068d00b005cd87069a84si12607668pgb.764.2024.01.16.13.16.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jan 2024 13:16:32 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-28009-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=PLxoNuvH; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-28009-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-28009-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 23CCBB22782 for ; Tue, 16 Jan 2024 20:58:08 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 7A5D313DB80; Tue, 16 Jan 2024 19:53:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="PLxoNuvH" 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 995F413D510; Tue, 16 Jan 2024 19:53:48 +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=1705434828; cv=none; b=PQajbYUZInNJALh/lzZfKaEylK8vXgE/wJ3sbcxjPP8xV2RbkXfo3ez4d595qwqYxT0f9xYHp4gzKArwtCr5EAYTEJj+Mi0k6Y3M90Tt8vTA8hSuY2rkGy+rl5wXAnFZ44krVmzKvHxdq3dllgSIAGmRewrcWZx+JqIQoSISlPo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705434828; 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=tJDCnsTWMDdw8fWbrKcDn5X7SmJ2ARHcsG5YIkV3O7kzfV8ExNS5AeEBzQFcRuUZmW35rXFBoPjpDMNWUX9OA/n5x+OF4KziKzzrsldlvVL/q2MsiiOSGo3+97dssyoZQG1iyaGDzjULaUKuMIMxrcYI3CJemEJxXs3aTk7CJv0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=PLxoNuvH; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id C055DC43394; Tue, 16 Jan 2024 19:53:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705434828; bh=mcZomUmBofZwrv5P/gxQDWjBxvcbEOUulhgq96eGZ9o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PLxoNuvHFZLVaPYkWHRLGhhPSY8hWPuGBrurANWrqwvLE3j6FHi511G7yFnZhhxwD J5kSmcFvEnXaNOzhRYEH6Oqe1jEqQrGQ3t8mRJI2+SjaX2sJ28TyaAdDrVGGA04Kg5 6zh65AsQrltRVXZqe4RB5Wppb/UhSFcNPDWtx3oU7+IXAi8aXvGjmJSnTcLOn+XdRs hP9IW99zrKmCJiW5mboD7H67ldusCKDZtdrEKDTqt/XZ/2sw8IMgWF0ZvlYCQVmOxD Gv5Zb6kKuE3EUeIbRlLv8q8+/zyCFYwNmRB7H1HKf4MbEOCwRZ4vEwnAnW5DtYzBjL x0EaLiqF/8i/w== 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.6 097/104] net/smc: disable SEID on non-s390 archs where virtual ISM may be used Date: Tue, 16 Jan 2024 14:47:03 -0500 Message-ID: <20240116194908.253437-97-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240116194908.253437-1-sashal@kernel.org> References: <20240116194908.253437-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@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.6.12 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