Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac713874 authored by Ursula Braun's avatar Ursula Braun Committed by David S. Miller
Browse files

smc: establish new socket family 



* enable smc module loading and unloading
 * register new socket family
 * basic smc socket creation and deletion
 * use backing TCP socket to run CLC (Connection Layer Control)
   handshake of SMC protocol
 * Setup for infiniband traffic is implemented in follow-on patches.
   For now fallback to TCP socket is always used.

Signed-off-by: default avatarUrsula Braun <ubraun@linux.vnet.ibm.com>
Reviewed-by: default avatarUtz Bacher <utz.bacher@de.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4b9d07a4

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -10850,6 +10850,13 @@ S: Maintained 
F:	drivers/staging/media/st-cec/

F:	Documentation/devicetree/bindings/media/stih-cec.txt



SHARED MEMORY COMMUNICATIONS (SMC) SOCKETS

M:	Ursula Braun <ubraun@linux.vnet.ibm.com>

L:	linux-s390@vger.kernel.org

W:	http://www.ibm.com/developerworks/linux/linux390/

S:	Supported

F:	net/smc/



SYNOPSYS DESIGNWARE DMAC DRIVER

M:	Viresh Kumar <vireshk@kernel.org>

M:	Andy Shevchenko <andriy.shevchenko@linux.intel.com>

include/linux/socket.h

+6 −1
Original line number Diff line number Diff line
@@ -202,8 +202,12 @@ struct ucred { 
#define AF_VSOCK	40	/* vSockets			*/

#define AF_KCM		41	/* Kernel Connection Multiplexor*/

#define AF_QIPCRTR	42	/* Qualcomm IPC Router          */

#define AF_SMC		43	/* smc sockets: reserve number for

				 * PF_SMC protocol family that

				 * reuses AF_INET address family

				 */



#define AF_MAX		43	/* For now.. */

#define AF_MAX		44	/* For now.. */



/* Protocol families, same as address families. */

#define PF_UNSPEC	AF_UNSPEC
@@ -251,6 +255,7 @@ struct ucred { 
#define PF_VSOCK	AF_VSOCK

#define PF_KCM		AF_KCM

#define PF_QIPCRTR	AF_QIPCRTR

#define PF_SMC		AF_SMC

#define PF_MAX		AF_MAX



/* Maximum queue length specifiable by listen.  */

net/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ source "net/packet/Kconfig" 
source "net/unix/Kconfig"

source "net/xfrm/Kconfig"

source "net/iucv/Kconfig"

source "net/smc/Kconfig"



config INET

	bool "TCP/IP networking"

net/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ obj-$(CONFIG_MAC80211) += mac80211/ 
obj-$(CONFIG_TIPC)		+= tipc/

obj-$(CONFIG_NETLABEL)		+= netlabel/

obj-$(CONFIG_IUCV)		+= iucv/

obj-$(CONFIG_SMC)		+= smc/

obj-$(CONFIG_RFKILL)		+= rfkill/

obj-$(CONFIG_NET_9P)		+= 9p/

obj-$(CONFIG_CAIF)		+= caif/

net/core/sock.c

+3 −3
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ static const char *const af_family_key_strings[AF_MAX+1] = { 
  "sk_lock-AF_RXRPC" , "sk_lock-AF_ISDN"     , "sk_lock-AF_PHONET"   ,

  "sk_lock-AF_IEEE802154", "sk_lock-AF_CAIF" , "sk_lock-AF_ALG"      ,

  "sk_lock-AF_NFC"   , "sk_lock-AF_VSOCK"    , "sk_lock-AF_KCM"      ,

  "sk_lock-AF_MAX"

  "sk_lock-AF_SMC"   , "sk_lock-AF_MAX"

};

static const char *const af_family_slock_key_strings[AF_MAX+1] = {

  "slock-AF_UNSPEC", "slock-AF_UNIX"     , "slock-AF_INET"     ,
@@ -239,7 +239,7 @@ static const char *const af_family_slock_key_strings[AF_MAX+1] = { 
  "slock-AF_RXRPC" , "slock-AF_ISDN"     , "slock-AF_PHONET"   ,

  "slock-AF_IEEE802154", "slock-AF_CAIF" , "slock-AF_ALG"      ,

  "slock-AF_NFC"   , "slock-AF_VSOCK"    ,"slock-AF_KCM"       ,

  "slock-AF_MAX"

  "slock-AF_SMC"   , "slock-AF_MAX"

};

static const char *const af_family_clock_key_strings[AF_MAX+1] = {

  "clock-AF_UNSPEC", "clock-AF_UNIX"     , "clock-AF_INET"     ,
@@ -256,7 +256,7 @@ static const char *const af_family_clock_key_strings[AF_MAX+1] = { 
  "clock-AF_RXRPC" , "clock-AF_ISDN"     , "clock-AF_PHONET"   ,

  "clock-AF_IEEE802154", "clock-AF_CAIF" , "clock-AF_ALG"      ,

  "clock-AF_NFC"   , "clock-AF_VSOCK"    , "clock-AF_KCM"      ,

  "clock-AF_MAX"

  "closck-AF_smc"  , "clock-AF_MAX"

};



/*