Merge branch 'master' into patch-1

craigloewen-msft · web-flow · commit 80dd0a8ae051 · 2020-07-07T16:20:26.000-07:00
diff --git a/WSL/about.md b/WSL/about.md
@@ -10,16 +10,16 @@ ms.localizationpriority: high
 
 # What is the Windows Subsystem for Linux?
 
-The Windows Subsystem for Linux lets developers run a GNU/Linux environment -- including most command-line tools, utilities, and applications -- directly on Windows, unmodified, without the overhead of a virtual machine.
+The Windows Subsystem for Linux lets developers run a GNU/Linux environment -- including most command-line tools, utilities, and applications -- directly on Windows, unmodified, without the overhead of a traditional virtual machine or dualboot setup.
 
 You can:
 
 * Choose your favorite GNU/Linux distributions [from the Microsoft Store](https://aka.ms/wslstore).
 * Run common command-line tools such as `grep`, `sed`, `awk`, or other ELF-64 binaries.
 * Run Bash shell scripts and GNU/Linux command-line applications including:  
     * Tools: vim, emacs, tmux
-    *Languages: [NodeJS](https://docs.microsoft.com/windows/nodejs/setup-on-wsl2), Javascript, [Python](https://docs.microsoft.com/windows/python/web-frameworks), Ruby, C/C++, C# & F#, Rust, Go, etc.
-    *Services: SSHD, MySQL, Apache, lighttpd, [MongoDB](https://docs.microsoft.com/windows/nodejs/databases), [PostgreSQL](https://docs.microsoft.com/windows/python/databases).
+    * Languages: [NodeJS](https://docs.microsoft.com/windows/nodejs/setup-on-wsl2), Javascript, [Python](https://docs.microsoft.com/windows/python/web-frameworks), Ruby, C/C++, C# & F#, Rust, Go, etc.
+    * Services: SSHD, MySQL, Apache, lighttpd, [MongoDB](https://docs.microsoft.com/windows/nodejs/databases), [PostgreSQL](https://docs.microsoft.com/windows/python/databases).
 * Install additional software using own GNU/Linux distribution package manager.
 * Invoke Windows applications using a Unix-like command-line shell.
 * Invoke GNU/Linux applications on Windows.
diff --git a/WSL/file-permissions.md b/WSL/file-permissions.md
@@ -103,4 +103,4 @@ Any files created, modified, or accessed in the Linux root file system follow st
 
 You can configure your file permissions inside of your Windows drives using the mount options in wsl.conf. The mount options allow you to set `umask`, `dmask` and `fmask` permissions masks. The `umask` is applied to all files, the `dmask` is applied just to directories and the `fmask` is applied just to files. These permission masks are then put through a logical OR operation when being applied to files, e.g: If you have a `umask` value of `023` and an `fmask` value of `022` then the resulting permissions mask for files will be `023`.
 
-Please see the [Configure launch settings with wslconf](./wsl-config.md#configure-launch-settings-with-wslconf) article for instructions on how to do this.
+Please see the [Configure per distro launch settings with wslconf](./wsl-config.md#configure-per-distro-launch-settings-with-wslconf) article for instructions on how to do this.
diff --git a/WSL/install-win10.md b/WSL/install-win10.md
@@ -23,7 +23,7 @@ To only install WSL 1, you should now restart your machine and move on to [Insta
 
 ## Update to WSL 2
 
-To update to WSL 2, you must meet the follow criteria:
+To update to WSL 2, you must meet the following criteria:
 
 - Running Windows 10, [updated to version 2004](ms-settings:windowsupdate), **Build 19041** or higher.
 
@@ -49,7 +49,7 @@ Run the following command in PowerShell to set WSL 2 as the default version when
 wsl --set-default-version 2
 ```
 
-You might see this message after running that command: `WSL 2 requires an update to its kernel component. For information please visit https://aka.ms/wsl2kernel` please follow the link and install the MSI from that page on our documentation to install a Linux kernel on your machine for WSL 2 to use. Once you have the kernel installed, please run the command again and it should complete successfully without showing the message. 
+You might see this message after running that command: `WSL 2 requires an update to its kernel component. For information please visit https://aka.ms/wsl2kernel`. Please follow the link ([https://aka.ms/wsl2kernel](https://aka.ms/wsl2kernel)) and install the MSI from that page on our documentation to install a Linux kernel on your machine for WSL 2 to use. Once you have the kernel installed, please run the command again and it should complete successfully without showing the message. 
 
 > [!NOTE]
 > The update from WSL 1 to WSL 2 may take several minutes to complete depending on the size of your targeted distribution. If you are running an older (legacy) installation of WSL 1 from Windows 10 Anniversary Update or Creators Update, you may encounter an update error. Follow these instructions to [uninstall and remove any legacy distributions](https://docs.microsoft.com/windows/wsl/install-legacy#uninstallingremoving-the-legacy-distro).
diff --git a/WSL/kernel-release-notes.md b/WSL/kernel-release-notes.md
@@ -2,7 +2,6 @@
 title: Release Notes for Windows Subsystem for Linux kernel
 description: Release notes for the Windows Subsystem for Linux.  Updated monthly.
 keywords: release notes, wsl, windows, windows subsystem for linux, windowssubsystem, ubuntu, kernel
-author: crloewen
 ms.date: 06/09/2020
 ms.topic: article
 ms.localizationpriority: high
@@ -15,7 +14,7 @@ We've added support for WSL 2 distributions, [which use a full Linux kernel](htt
 ## 4.19.121-microsoft-standard
 *Release Date*: Prerelease
 
-[Official Github release link](https://github.com/microsoft/WSL2-Linux-Kernel/releases/tag/4.19.104-microsoft-standard).
+[Official Github release link](https://github.com/microsoft/WSL2-Linux-Kernel/releases/tag/4.19.121-microsoft-standard).
 
 * Drivers: hv: vmbus: hook up dxgkrnl
 * Added support for GPU Compute
diff --git a/WSL/media/wsl2-network-l2w.png b/WSL/media/wsl2-network-l2w.png
diff --git a/WSL/release-notes.md b/WSL/release-notes.md
@@ -10,6 +10,17 @@ ms.localizationpriority: high
 
 # Release Notes for Windows Subsystem for Linux
 
+## Build 20150
+For general Windows information on build 20150 visit the [Windows blog](https://blogs.windows.com/windowsexperience/2020/06/17/announcing-windows-10-insider-preview-build-20150/).
+
+* WSL2 GPU compute see [Windows blog](https://blogs.windows.com/windowsexperience/2020/06/17/announcing-windows-10-insider-preview-build-20150/) for more information.
+* Introduce wsl.exe --install command line option to easily set up WSL.
+* Introduce wsl.exe --update command line option to manage updates to the WSL2 kernel. 
+* Set WSL2 as the default.
+* Increase WSL2 vm graceful shutdown timeout.
+* Fix virtio-9p race condition when mapping device memory.
+* Don't run an elevated 9p server if UAC is disabled.
+
 ## Build 19640
 For general Windows information on build 19640 visit the [Windows blog](https://blogs.windows.com/windowsexperience/2020/06/03/announcing-windows-10-insider-preview-build-19640/).
 
diff --git a/WSL/toc.yml b/WSL/toc.yml
@@ -22,6 +22,8 @@
       href: tutorials/wsl-vscode.md
     - name: Get started with Git
       href: tutorials/wsl-git.md
+    - name: Set up GPU acceleration (NVIDIA CUDA/DirectML)
+      href: tutorials/gpu-compute.md
 - name: How-to
   items:
     - name: Interoperability commands
diff --git a/WSL/troubleshooting.md b/WSL/troubleshooting.md
@@ -36,6 +36,41 @@ Lastly, if your issue is related to the Windows Terminal, Windows Console, or th
 
 ## Common issues
 
+### Cannot access WSL files from Windows
+A 9p protocol file server provides the service on the Linux side to allow Windows to access the Linux file system. If you cannot access WSL using `\\wsl$` on Windows, it could be because 9P did not start correctly.
+
+To check this, you can check the start up logs using: `dmesg |grep 9p`, and this will show you any errors. A successfull output looks like the following: 
+
+```
+[    0.363323] 9p: Installing v9fs 9p2000 file system support
+[    0.363336] FS-Cache: Netfs '9p' registered for caching
+[    0.398989] 9pnet: Installing 9P2000 support
+```
+
+Please see [this Github thread](https://github.com/microsoft/wsl/issues/5307) for further discussion on this issue.
+
+### Can't start WSL 2 distro and only see 'WSL 2' in output
+If your display language is not English, then it is possible you are seeing a truncated version of an error text.
+
+```powershell
+C:\Users\me>wsl
+WSL 2
+```
+
+To resolve this issue, please visit `https://aka.ms/wsl2kernel` and install the kernel manually by following the directions on that doc page. 
+
+### Please enable the Virtual Machine Platform Windows feature and ensure virtualization is enabled in the BIOS.
+
+1. Check the [Hyper-V system requirements](https://docs.microsoft.com/windows-server/virtualization/hyper-v/system-requirements-for-hyper-v-on-windows#:~:text=on%20Windows%20Server.-,General%20requirements,the%20processor%20must%20have%20SLAT.)
+2. If your machine is a VM, please enable [nested virtualization](https://docs.microsoft.com/windows/wsl/wsl2-faq#can-i-run-wsl-2-in-a-virtual-machine) manually. Launch powershell with admin, and run: 
+
+```powershell
+Set-VMProcessor -VMName <VMName> -ExposeVirtualizationExtensions $true
+```
+
+3. Please follow guidelines from your PC's manufacturer on how to enable virtualization. In general, this can involve using the system BIOS to ensure that these features are enabled on your CPU. 
+4. Restart your machine after enabling the `Virtual Machine Platform` optional component. 
+
 ### Bash loses network connectivity once connected to a VPN
 
 If after connecting to a VPN on Windows, bash loses network connectivity, try this workaround from within bash. This workaround will allow you to manually override the DNS resolution through `/etc/resolv.conf`.
diff --git a/WSL/tutorials/gpu-compute.md b/WSL/tutorials/gpu-compute.md
@@ -0,0 +1,23 @@
+---
+title: GPU accelerated Machine Learning training in the Windows Subsystem for Linux
+description: Learn more about WSL 2 support for NVIDIA CUDA, DirectML, Tensorflow, and PyTorch.
+keywords: wsl, windows, windows subsystem, gpu compute, gpu acceleration, NVIDIA, CUDA, DirectML, Tensorflow, PyTorch, NVIDIA CUDA preview, GPU driver, NVIDIA Container Toolkit, Docker
+ms.date: 06/17/2020
+ms.topic: article
+ms.localizationpriority: medium
+---
+
+# GPU accelerated machine learning training in the Windows Subsystem for Linux
+
+Support for GPU compute, the #1 most requested WSL feature, is now available for preview via the Windows Insider program. [Read the blog post](https://blogs.windows.com/windowsdeveloper/?p=55781).
+
+## What is GPU compute?
+
+Leveraging GPU acceleration for compute-intensive tasks is generally referred  to as "GPU compute". GPU computing leverages the GPU (graphics processing unit) to accelerate math heavy workloads and uses its parallel processing to complete the required calculations faster, in many cases, than utilizing only a CPU. This parallelization enables significant processing speed improvements for these math heavy workloads then when running on a CPU. Training machine learning models is a great example in which GPU compute can significantly accelerate the time to complete this computationally expensive task.
+
+## Install and set up
+
+Learn more about WSL 2 support and how to start training machine learning models in the [GPU Accelerated Training guide](https://docs.microsoft.com/windows/win32/direct3d12/gpu-accelerated-training) inside the DirectML docs. This guide covers:
+
+* Guidance for beginners or students to set up TensorFlow with DirectML
+* Guidance for professionals to start running their exisiting CUDA ML workflows
diff --git a/WSL/tutorials/wsl-git.md b/WSL/tutorials/wsl-git.md
@@ -31,13 +31,32 @@ You will need to install Git on each file system that you intend to use it with.
 
 ## Installing Git
 
-Git comes already installed with most of the Windows Subsystem for Linux distributions, however, you may want to update to the latest version and you will need to set up your git config file.
+Git comes already installed with most of the Windows Subsystem for Linux distributions, however, you may want to update to the latest version. You also will need to set up your git config file.
 
-To install Git, see the [Git Download for Linux](https://git-scm.com/download/linux) site. Each Linux distribution has their own package manager and install command. For example, to install Git on the Alpine distribution, use: `apk add git`. You also may want to [install Git for Windows](https://git-scm.com/download/win) if you haven't already.
+To install Git, see the [Git Download for Linux](https://git-scm.com/download/linux) site. Each Linux distribution has their own package manager and install command.
+
+For the latest stable GIt version in Ubuntu/Debian, enter the command:
+
+```bash
+sudo apt-get install git
+```
+
+> [!NOTE]
+> You also may want to [install Git for Windows](https://git-scm.com/download/win) if you haven't already.
 
 ## Git config file setup
 
-To set up your Git config file, open a command line for the distribution you're working in and enter: `git config --global user.name "Your Name"` and then, `git config --global user.email "youremail@domain.com"`. Replacing the content in quotations with the name and email address that you used to create your Git account.
+To set up your Git config file, open a command line for the distribution you're working in and set your name with this command (replacing "Your Name" with your Git username):
+
+```bash
+ `git config --global user.name "Your Name"`
+```
+
+Set your email with this command (replacing "youremail@domain.com" with the email you use on your Git account):
+
+```bash
+`git config --global user.email "youremail@domain.com"`
+```
 
 > [!TIP]
 > If you don't yet have a Git account, you can [sign-up for one on GitHub](https://github.com/join). If you've never worked with Git before, [GitHub Guides](https://guides.github.com/) can help you get started. If you need to edit your git config, you can do so with a built-in text editor like nano: `nano ~/.gitconfig`.
@@ -56,9 +75,12 @@ git config --global credential.helper "/mnt/c/Program\ Files/Git/mingw64/libexec
 
 Now any git operation you perform within your WSL distribution will use the credential manager. If you already have credentials cached for a host, it will access them from the credential manager. If not, you'll receive a dialog response requesting your credentials, even if you're in a Linux console.
 
+> [!NOTE]
+> If you are using a GPG key for code signing security, you may need to [associate your GPG key with your GitHub email](https://help.github.com/en/github/authenticating-to-github/associating-an-email-with-your-gpg-key).
+
 ## Adding a Git Ignore file
 
-We recommend adding a [.gitignore file](https://help.github.com/en/articles/ignoring-files) to your projects. GitHub offers [a collection of useful .gitignore templates](https://github.com/github/gitignore) with recommended .gitignore file setups organized according to your use-case.
+We recommend adding a [.gitignore file](https://help.github.com/en/articles/ignoring-files) to your projects. GitHub offers [a collection of useful .gitignore templates](https://github.com/github/gitignore) with recommended .gitignore file setups organized according to your use-case. For example, here is [GitHub's default gitignore template for a Node.js project](https://github.com/github/gitignore/blob/master/Node.gitignore).
 
 If you choose to [create a new repo using the GitHub website](https://help.github.com/articles/create-a-repo), there are check boxes available to initialize your repo with a README file, .gitignore file set up for your specific project type, and options to add a license if you need one.
 
diff --git a/WSL/wsl-config.md b/WSL/wsl-config.md
@@ -318,7 +318,7 @@ These options are available in Build 18980 and later.
 
 > **Available in Windows Build 19041 and later**
 
-You can configure global WSL options by placing a `.wslconfig` file into the root directory of your users folder: `C:\Users\<yourUserName>\.wslconfig`. 
+You can configure global WSL options by placing a `.wslconfig` file into the root directory of your users folder: `C:\Users\<yourUserName>\.wslconfig`. Many of these files are related to WSL 2, please keep in mind you may need to run `wsl --shutdown` to shut down the WSL 2 VM and then restart your WSL instance for these changes to take affect.
 
 Here is a sample .wslconfig file:
 
diff --git a/WSL/wsl2-index.md b/WSL/wsl2-index.md
@@ -9,7 +9,7 @@ ms.localizationpriority: high
 
 # What's New in WSL 2?
 
-WSL 2 is a new version of the architecture in WSL that changes how Linux distributions interact with Windows. WSL 2 has the primary goals of increasing file system performance and adding full system call compatibility. Each Linux distribution can run as WSL 1 or a WSL 2 and can be switched between at any time. WSL 2 is a major overhaul of the underlying architecture and uses virtualization technology and a Linux kernel to enable its new features.
+WSL 2 is a new version of the architecture in WSL that changes how Linux distributions interact with Windows. WSL 2 has the primary goals of increasing file system performance and adding full system call compatibility. Each Linux distribution can run as WSL 1 or as WSL 2, and can be switched between at any time. WSL 2 is a major overhaul of the underlying architecture and uses virtualization technology and a Linux kernel to enable its new features.
 
 WSL 2 is only available in Windows 10, Version 2004, Build 19041 or higher. You may need to [update your Windows version](ms-settings:windowsupdate).
 
diff --git a/WSL/wsl2-kernel.md b/WSL/wsl2-kernel.md
@@ -34,3 +34,24 @@ To install the Linux kernel update package:
 ## Future plans for updating the WSL2 Linux kernel
 
 For more information, read the article [changes to updating the WSL2 Linux kernel](https://devblogs.microsoft.com/commandline/wsl2-will-be-generally-available-in-windows-10-version-2004), available on the [Windows Command Line Blog](https://aka.ms/cliblog).
+
+## Troubleshooting
+
+### This update only applies to machines with the Windows Subsystem for Linux
+To install MSI kernel, WSL is required and should be enabled first. If it fails, it you will see the message:
+`This update only applies to machines with the Windows Subsytem for Linux`. 
+
+There are three possible reason you see this message:
+
+1. You are still in old version of Windows which doesn't support WSL 2. Please check the [WSL 2 requirements](https://docs.microsoft.com/windows/wsl/install-win10#update-to-wsl-2) and upgrade to use WSL 2. 
+2. `Windows Subsystem for Linux` is not enabled. Please follow the [Windows Subsystem for Linux Installation Guide](https://docs.microsoft.com/windows/wsl/install-win10).
+3. After you enabled `Windows Subsystem for Linux`, a reboot is required to take into effect, please reboot your machine and try again.
+
+### `WSL 2 requires an update to its kernel component. For information please visit https://aka.ms/wsl2kernel`
+
+Each time kernel is missing in %SystemRoot%\system32\lxss\tools\, you may run into the above error.
+
+Here are some possible ways to resolve it:
+
+1. Please install the Linux kernel manually by following the instructions at: https://aka.ms/wsl2kernel
+2. Uninstall the MSI from 'Add or Remove Programs', and install it again

Original file line number	Diff line number	Diff line change
`@@ -103,4 +103,4 @@ Any files created, modified, or accessed in the Linux root file system follow st`
`103`	`103`
`104`	`104`	You can configure your file permissions inside of your Windows drives using the mount options in wsl.conf. The mount options allow you to set `umask`, `dmask` and `fmask` permissions masks. The `umask` is applied to all files, the `dmask` is applied just to directories and the `fmask` is applied just to files. These permission masks are then put through a logical OR operation when being applied to files, e.g: If you have a `umask` value of `023` and an `fmask` value of `022` then the resulting permissions mask for files will be `023`.
`105`	`105`
`106`		`-Please see the [Configure launch settings with wslconf](./wsl-config.md#configure-launch-settings-with-wslconf) article for instructions on how to do this.`
	`106`	`+Please see the [Configure per distro launch settings with wslconf](./wsl-config.md#configure-per-distro-launch-settings-with-wslconf) article for instructions on how to do this.`