Commit 5cf37738 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'SMB-rootfs' 



Paulo Alcantara says:

====================
Experimental SMB rootfs support

This patch series enables Linux to mount root file systems over the
network by utilizing SMB protocol.

Upstream commit 8eecd1c2 ("cifs: Add support for root file
systems") introduced a new CONFIG_CIFS_ROOT option, a virtual device
(Root_CIFS) and a kernel cmdline parameter "cifsroot=" which tells the
kernel to actually mount the root filesystem over a SMB share.

The feature relies on ipconfig to set up the network prior to mounting
the rootfs, so when it is set along with "cifsroot=" parameter:

    (1) cifs_root_setup() parses all necessary data out of "cifsroot="
    parameter for the init process know how to mount the SMB rootfs
    (e.g. SMB server address, mount options).

    (2) If DHCP failed for some reason in ipconfig, we keep retrying
    forever as we have nowhere to go for NFS or SMB root
    filesystems (see PATCH 2/2). Otherwise go to (3).

    (3) mount_cifs_root() is then called by mount_root() (ROOT_DEV ==
    Root_CIFS), retrieves early parsed data from (1), then attempt to
    mount SMB rootfs by CIFSROOT_RETRY_MAX times at most (see PATCH
    1/2).

    (4) If all attempts failed, fall back to floppy drive, otherwise
    continue the boot process with rootfs mounted over a SMB share.

My idea was to keep the same behavior of nfsroot - as it seems to work
for most users so far.

For more information on how this feature works, see
Documentation/filesystems/cifs/cifsroot.txt.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 1f6d768a 51976f47

init/do_mounts.c

+49 −0
Original line number Diff line number Diff line
@@ -212,6 +212,7 @@ static int match_dev_by_label(struct device *dev, const void *data) 
 *	   a colon.

 *	9) PARTLABEL=<name> with name being the GPT partition label.

 *	   MSDOS partitions do not support labels!

 *	10) /dev/cifs represents Root_CIFS (0xfe)

 *

 *	If name doesn't have fall into the categories above, we return (0,0).

 *	block_class is used to check if something is a disk name. If the disk
@@ -268,6 +269,9 @@ dev_t name_to_dev_t(const char *name) 
	res = Root_NFS;

	if (strcmp(name, "nfs") == 0)

		goto done;

	res = Root_CIFS;

	if (strcmp(name, "cifs") == 0)

		goto done;

	res = Root_RAM0;

	if (strcmp(name, "ram") == 0)

		goto done;
@@ -501,6 +505,42 @@ static int __init mount_nfs_root(void) 
}

#endif



#ifdef CONFIG_CIFS_ROOT



extern int cifs_root_data(char **dev, char **opts);



#define CIFSROOT_TIMEOUT_MIN	5

#define CIFSROOT_TIMEOUT_MAX	30

#define CIFSROOT_RETRY_MAX	5



static int __init mount_cifs_root(void)

{

	char *root_dev, *root_data;

	unsigned int timeout;

	int try, err;



	err = cifs_root_data(&root_dev, &root_data);

	if (err != 0)

		return 0;



	timeout = CIFSROOT_TIMEOUT_MIN;

	for (try = 1; ; try++) {

		err = do_mount_root(root_dev, "cifs", root_mountflags,

				    root_data);

		if (err == 0)

			return 1;

		if (try > CIFSROOT_RETRY_MAX)

			break;



		ssleep(timeout);

		timeout <<= 1;

		if (timeout > CIFSROOT_TIMEOUT_MAX)

			timeout = CIFSROOT_TIMEOUT_MAX;

	}

	return 0;

}

#endif



#if defined(CONFIG_BLK_DEV_RAM) || defined(CONFIG_BLK_DEV_FD)

void __init change_floppy(char *fmt, ...)

{
@@ -542,6 +582,15 @@ void __init mount_root(void) 
		ROOT_DEV = Root_FD0;

	}

#endif

#ifdef CONFIG_CIFS_ROOT

	if (ROOT_DEV == Root_CIFS) {

		if (mount_cifs_root())

			return;



		printk(KERN_ERR "VFS: Unable to mount root fs via SMB, trying floppy.\n");

		ROOT_DEV = Root_FD0;

	}

#endif

#ifdef CONFIG_BLK_DEV_FD

	if (MAJOR(ROOT_DEV) == FLOPPY_MAJOR) {

		/* rd_doload is 2 for a dual initrd/ramload setup */

net/ipv4/ipconfig.c

+8 −2
Original line number Diff line number Diff line
@@ -1483,10 +1483,10 @@ static int __init ip_auto_config(void) 
	 * missing values.

	 */

	if (ic_myaddr == NONE ||

#ifdef CONFIG_ROOT_NFS

#if defined(CONFIG_ROOT_NFS) || defined(CONFIG_CIFS_ROOT)

	    (root_server_addr == NONE &&

	     ic_servaddr == NONE &&

	     ROOT_DEV == Root_NFS) ||

	     (ROOT_DEV == Root_NFS || ROOT_DEV == Root_CIFS)) ||

#endif

	    ic_first_dev->next) {

#ifdef IPCONFIG_DYNAMIC
@@ -1513,6 +1513,12 @@ static int __init ip_auto_config(void) 
				goto try_try_again;

			}

#endif

#ifdef CONFIG_CIFS_ROOT

			if (ROOT_DEV == Root_CIFS) {

				pr_err("IP-Config: Retrying forever (CIFS root)...\n");

				goto try_try_again;

			}

#endif



			if (--retries) {

				pr_err("IP-Config: Reopening network devices...\n");

CRA Git | Maintained and supported by SUSTech CRA and CCSE