* [PATCH net-next 0/2] smc: Updates 2023-03-01
@ 2023-03-13 10:10 Wenjia Zhang
2023-03-13 10:10 ` [PATCH net-next 1/2] net/smc: Introduce explicit check for v2 support Wenjia Zhang
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Wenjia Zhang @ 2023-03-13 10:10 UTC (permalink / raw)
To: David Miller, Jakub Kicinski
Cc: netdev, linux-s390, Eric Dumazet, Paolo Abeni, Heiko Carstens,
Karsten Graul, Alexandra Winter, Jan Karcher, Stefan Raspl,
Tony Lu, Wenjia Zhang
The 1st patch is to make implements later do not need to adhere to a
specific SEID format. The 2nd patch does some cleanup.
Stefan Raspl (2):
net/smc: Introduce explicit check for v2 support
net/ism: Remove extra include
drivers/s390/net/ism_drv.c | 8 +++++++-
include/net/smc.h | 1 +
net/smc/smc_ism.c | 2 +-
3 files changed, 9 insertions(+), 2 deletions(-)
--
2.37.2
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH net-next 1/2] net/smc: Introduce explicit check for v2 support 2023-03-13 10:10 [PATCH net-next 0/2] smc: Updates 2023-03-01 Wenjia Zhang @ 2023-03-13 10:10 ` Wenjia Zhang 2023-03-13 11:19 ` Tony Lu 2023-03-13 10:10 ` [PATCH net-next 2/2] net/ism: Remove extra include Wenjia Zhang 2023-03-15 8:20 ` [PATCH net-next 0/2] smc: Updates 2023-03-01 patchwork-bot+netdevbpf 2 siblings, 1 reply; 6+ messages in thread From: Wenjia Zhang @ 2023-03-13 10:10 UTC (permalink / raw) To: David Miller, Jakub Kicinski Cc: netdev, linux-s390, Eric Dumazet, Paolo Abeni, Heiko Carstens, Karsten Graul, Alexandra Winter, Jan Karcher, Stefan Raspl, Tony Lu, Wenjia Zhang From: Stefan Raspl <raspl@linux.ibm.com> Previously, v2 support was derived from a very specific format of the SEID as part of the SMC-D codebase. Make this part of the SMC-D device API, so implementers do not need to adhere to a specific SEID format. Signed-off-by: Stefan Raspl <raspl@linux.ibm.com> Reviewed-and-tested-by: Jan Karcher <jaka@linux.ibm.com> Reviewed-by: Wenjia Zhang <wenjia@linux.ibm.com> Signed-off-by: Wenjia Zhang <wenjia@linux.ibm.com> --- drivers/s390/net/ism_drv.c | 7 +++++++ include/net/smc.h | 1 + net/smc/smc_ism.c | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/s390/net/ism_drv.c b/drivers/s390/net/ism_drv.c index eb7e13486087..1c73d32966f1 100644 --- a/drivers/s390/net/ism_drv.c +++ b/drivers/s390/net/ism_drv.c @@ -842,6 +842,12 @@ static int smcd_move(struct smcd_dev *smcd, u64 dmb_tok, unsigned int idx, return ism_move(smcd->priv, dmb_tok, idx, sf, offset, data, size); } +static int smcd_supports_v2(void) +{ + return SYSTEM_EID.serial_number[0] != '0' || + SYSTEM_EID.type[0] != '0'; +} + static u64 smcd_get_local_gid(struct smcd_dev *smcd) { return ism_get_local_gid(smcd->priv); @@ -869,6 +875,7 @@ static const struct smcd_ops ism_ops = { .reset_vlan_required = smcd_reset_vlan_required, .signal_event = smcd_signal_ieq, .move_data = smcd_move, + .supports_v2 = smcd_supports_v2, .get_system_eid = ism_get_seid, .get_local_gid = smcd_get_local_gid, .get_chid = smcd_get_chid, diff --git a/include/net/smc.h b/include/net/smc.h index 597cb9381182..a002552be29c 100644 --- a/include/net/smc.h +++ b/include/net/smc.h @@ -67,6 +67,7 @@ struct smcd_ops { int (*move_data)(struct smcd_dev *dev, u64 dmb_tok, unsigned int idx, bool sf, unsigned int offset, void *data, unsigned int size); + int (*supports_v2)(void); u8* (*get_system_eid)(void); u64 (*get_local_gid)(struct smcd_dev *dev); u16 (*get_chid)(struct smcd_dev *dev); diff --git a/net/smc/smc_ism.c b/net/smc/smc_ism.c index 3b0b7710c6b0..fbee2493091f 100644 --- a/net/smc/smc_ism.c +++ b/net/smc/smc_ism.c @@ -429,7 +429,7 @@ static void smcd_register_dev(struct ism_dev *ism) u8 *system_eid = NULL; system_eid = smcd->ops->get_system_eid(); - if (system_eid[24] != '0' || system_eid[28] != '0') { + if (smcd->ops->supports_v2()) { smc_ism_v2_capable = true; memcpy(smc_ism_v2_system_eid, system_eid, SMC_MAX_EID_LEN); -- 2.37.2 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH net-next 1/2] net/smc: Introduce explicit check for v2 support 2023-03-13 10:10 ` [PATCH net-next 1/2] net/smc: Introduce explicit check for v2 support Wenjia Zhang @ 2023-03-13 11:19 ` Tony Lu 0 siblings, 0 replies; 6+ messages in thread From: Tony Lu @ 2023-03-13 11:19 UTC (permalink / raw) To: Wenjia Zhang Cc: David Miller, Jakub Kicinski, netdev, linux-s390, Eric Dumazet, Paolo Abeni, Heiko Carstens, Karsten Graul, Alexandra Winter, Jan Karcher, Stefan Raspl On Mon, Mar 13, 2023 at 11:10:31AM +0100, Wenjia Zhang wrote: > From: Stefan Raspl <raspl@linux.ibm.com> > > Previously, v2 support was derived from a very specific format of the SEID > as part of the SMC-D codebase. Make this part of the SMC-D device API, so > implementers do not need to adhere to a specific SEID format. > > Signed-off-by: Stefan Raspl <raspl@linux.ibm.com> > Reviewed-and-tested-by: Jan Karcher <jaka@linux.ibm.com> > Reviewed-by: Wenjia Zhang <wenjia@linux.ibm.com> > Signed-off-by: Wenjia Zhang <wenjia@linux.ibm.com> This solved my doubts about the magic number, and helps the extensions of SMC-D. Thank you. Reviewed-by: Tony Lu <tonylu@linux.alibaba.com> > --- > drivers/s390/net/ism_drv.c | 7 +++++++ > include/net/smc.h | 1 + > net/smc/smc_ism.c | 2 +- > 3 files changed, 9 insertions(+), 1 deletion(-) > > diff --git a/drivers/s390/net/ism_drv.c b/drivers/s390/net/ism_drv.c > index eb7e13486087..1c73d32966f1 100644 > --- a/drivers/s390/net/ism_drv.c > +++ b/drivers/s390/net/ism_drv.c > @@ -842,6 +842,12 @@ static int smcd_move(struct smcd_dev *smcd, u64 dmb_tok, unsigned int idx, > return ism_move(smcd->priv, dmb_tok, idx, sf, offset, data, size); > } > > +static int smcd_supports_v2(void) > +{ > + return SYSTEM_EID.serial_number[0] != '0' || > + SYSTEM_EID.type[0] != '0'; > +} > + > static u64 smcd_get_local_gid(struct smcd_dev *smcd) > { > return ism_get_local_gid(smcd->priv); > @@ -869,6 +875,7 @@ static const struct smcd_ops ism_ops = { > .reset_vlan_required = smcd_reset_vlan_required, > .signal_event = smcd_signal_ieq, > .move_data = smcd_move, > + .supports_v2 = smcd_supports_v2, > .get_system_eid = ism_get_seid, > .get_local_gid = smcd_get_local_gid, > .get_chid = smcd_get_chid, > diff --git a/include/net/smc.h b/include/net/smc.h > index 597cb9381182..a002552be29c 100644 > --- a/include/net/smc.h > +++ b/include/net/smc.h > @@ -67,6 +67,7 @@ struct smcd_ops { > int (*move_data)(struct smcd_dev *dev, u64 dmb_tok, unsigned int idx, > bool sf, unsigned int offset, void *data, > unsigned int size); > + int (*supports_v2)(void); > u8* (*get_system_eid)(void); > u64 (*get_local_gid)(struct smcd_dev *dev); > u16 (*get_chid)(struct smcd_dev *dev); > diff --git a/net/smc/smc_ism.c b/net/smc/smc_ism.c > index 3b0b7710c6b0..fbee2493091f 100644 > --- a/net/smc/smc_ism.c > +++ b/net/smc/smc_ism.c > @@ -429,7 +429,7 @@ static void smcd_register_dev(struct ism_dev *ism) > u8 *system_eid = NULL; > > system_eid = smcd->ops->get_system_eid(); > - if (system_eid[24] != '0' || system_eid[28] != '0') { > + if (smcd->ops->supports_v2()) { > smc_ism_v2_capable = true; > memcpy(smc_ism_v2_system_eid, system_eid, > SMC_MAX_EID_LEN); > -- > 2.37.2 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH net-next 2/2] net/ism: Remove extra include 2023-03-13 10:10 [PATCH net-next 0/2] smc: Updates 2023-03-01 Wenjia Zhang 2023-03-13 10:10 ` [PATCH net-next 1/2] net/smc: Introduce explicit check for v2 support Wenjia Zhang @ 2023-03-13 10:10 ` Wenjia Zhang 2023-03-13 11:15 ` Tony Lu 2023-03-15 8:20 ` [PATCH net-next 0/2] smc: Updates 2023-03-01 patchwork-bot+netdevbpf 2 siblings, 1 reply; 6+ messages in thread From: Wenjia Zhang @ 2023-03-13 10:10 UTC (permalink / raw) To: David Miller, Jakub Kicinski Cc: netdev, linux-s390, Eric Dumazet, Paolo Abeni, Heiko Carstens, Karsten Graul, Alexandra Winter, Jan Karcher, Stefan Raspl, Tony Lu, Wenjia Zhang From: Stefan Raspl <raspl@linux.ibm.com> Signed-off-by: Stefan Raspl <raspl@linux.ibm.com> Signed-off-by: Wenjia Zhang <wenjia@linux.ibm.com> --- drivers/s390/net/ism_drv.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/s390/net/ism_drv.c b/drivers/s390/net/ism_drv.c index 1c73d32966f1..05749c877990 100644 --- a/drivers/s390/net/ism_drv.c +++ b/drivers/s390/net/ism_drv.c @@ -11,7 +11,6 @@ #include <linux/types.h> #include <linux/interrupt.h> #include <linux/device.h> -#include <linux/pci.h> #include <linux/err.h> #include <linux/ctype.h> #include <linux/processor.h> -- 2.37.2 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH net-next 2/2] net/ism: Remove extra include 2023-03-13 10:10 ` [PATCH net-next 2/2] net/ism: Remove extra include Wenjia Zhang @ 2023-03-13 11:15 ` Tony Lu 0 siblings, 0 replies; 6+ messages in thread From: Tony Lu @ 2023-03-13 11:15 UTC (permalink / raw) To: Wenjia Zhang Cc: David Miller, Jakub Kicinski, netdev, linux-s390, Eric Dumazet, Paolo Abeni, Heiko Carstens, Karsten Graul, Alexandra Winter, Jan Karcher, Stefan Raspl On Mon, Mar 13, 2023 at 11:10:32AM +0100, Wenjia Zhang wrote: > From: Stefan Raspl <raspl@linux.ibm.com> > > Signed-off-by: Stefan Raspl <raspl@linux.ibm.com> > Signed-off-by: Wenjia Zhang <wenjia@linux.ibm.com> Reviewed-by: Tony Lu <tonylu@linux.alibaba.com> > --- > drivers/s390/net/ism_drv.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/drivers/s390/net/ism_drv.c b/drivers/s390/net/ism_drv.c > index 1c73d32966f1..05749c877990 100644 > --- a/drivers/s390/net/ism_drv.c > +++ b/drivers/s390/net/ism_drv.c > @@ -11,7 +11,6 @@ > #include <linux/types.h> > #include <linux/interrupt.h> > #include <linux/device.h> > -#include <linux/pci.h> > #include <linux/err.h> > #include <linux/ctype.h> > #include <linux/processor.h> > -- > 2.37.2 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net-next 0/2] smc: Updates 2023-03-01 2023-03-13 10:10 [PATCH net-next 0/2] smc: Updates 2023-03-01 Wenjia Zhang 2023-03-13 10:10 ` [PATCH net-next 1/2] net/smc: Introduce explicit check for v2 support Wenjia Zhang 2023-03-13 10:10 ` [PATCH net-next 2/2] net/ism: Remove extra include Wenjia Zhang @ 2023-03-15 8:20 ` patchwork-bot+netdevbpf 2 siblings, 0 replies; 6+ messages in thread From: patchwork-bot+netdevbpf @ 2023-03-15 8:20 UTC (permalink / raw) To: Wenjia Zhang Cc: davem, kuba, netdev, linux-s390, edumazet, pabeni, hca, kgraul, wintera, jaka, raspl, tonylu Hello: This series was applied to netdev/net-next.git (main) by David S. Miller <davem@davemloft.net>: On Mon, 13 Mar 2023 11:10:30 +0100 you wrote: > The 1st patch is to make implements later do not need to adhere to a > specific SEID format. The 2nd patch does some cleanup. > > Stefan Raspl (2): > net/smc: Introduce explicit check for v2 support > net/ism: Remove extra include > > [...] Here is the summary with links: - [net-next,1/2] net/smc: Introduce explicit check for v2 support https://git.kernel.org/netdev/net-next/c/f947568e2580 - [net-next,2/2] net/ism: Remove extra include https://git.kernel.org/netdev/net-next/c/298c91dc40e5 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-03-15 8:20 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2023-03-13 10:10 [PATCH net-next 0/2] smc: Updates 2023-03-01 Wenjia Zhang 2023-03-13 10:10 ` [PATCH net-next 1/2] net/smc: Introduce explicit check for v2 support Wenjia Zhang 2023-03-13 11:19 ` Tony Lu 2023-03-13 10:10 ` [PATCH net-next 2/2] net/ism: Remove extra include Wenjia Zhang 2023-03-13 11:15 ` Tony Lu 2023-03-15 8:20 ` [PATCH net-next 0/2] smc: Updates 2023-03-01 patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).